9 use gitlab git #102

eugenk · 2017-04-12T17:16:02Z

This shall fix #9. As a follow-up, I created #85, #96, #97, #98, #99, #100, #101 and #104 for the next steps.

There are already some library methods for these new issues. Most of them only need to be exposed to the Ontohub API.

This pull request depends on ontohub/ontohub-models#67 for the seeds.

Usage

Login with a user:

http -j POST :3000/users/sign_in user:='{"name": "ada", "password": "changeme"}'

Say, your token is ABCdef123. Then store it in the shell variable TOKEN

TOKEN="ABCdef123"

Create a file:
either with base64 encoding

http -j POST :3000/ada/repo0/ref/master/tree data:='{"attributes": {"content": "bXkgY29udGVudA==", "encoding": "base64", "commit_message": "add file", "path": "test.txt"}}' "Authorization: Bearer $TOKEN"

or with plain text:

http -j POST :3000/ada/repo0/ref/master/tree data:='{"attributes": {"content": "my content", "encoding": "plain", "commit_message": "add file", "path": "test.txt"}}' "Authorization: Bearer $TOKEN"

Move a file:

http -j PATCH :3000/ada/repo0/ref/master/tree/test.txt data:='{"attributes": {"commit_message": "move a file", "path": "moved_test.txt"}}' "Authorization: Bearer $TOKEN"

Change file contents:

http -j PATCH :3000/ada/repo0/ref/master/tree/test.txt data:='{"attributes": {"content": "my new content", "encoding": "plain", "commit_message": "change a file"}}' "Authorization: Bearer $TOKEN"

Get a file (no login required):

http -j :3000/ada/repo0/ref/master/tree/test.txt
http -j :3000/ada/repo0/tree/test.txt

Get a directory (no login required):

http -j :3000/ada/repo0/ref/master/tree/
http -j :3000/ada/repo0/tree/

Delete a file:

http -j DELETE :3000/ada/repo0/ref/master/tree/test.txt  "Authorization: Bearer $TOKEN"

Instead of 2:45 minutes, the specs take now about 37 seconds.

… as the routes have been loaded.

* Create: http --timeout=3600 -j POST :3000/ada/repo0/ref/master/tree data:='{"attributes": {"content": "aGFuc21laXNlcg==", "encoding": "base64", "commit_message": "do something", "path": "my_test.txt"}}' * Show: http --timeout=3600 -j GET :3000/ada/repo0/ref/master/tree/my_test.txt * Rename without content change: http --timeout=3600 -j PATCH :3000/ada/repo0/ref/master/tree/my_test.txt data:='{"attributes": {"commit_message": "do something", "path": "my_test_renamed.txt"}}' * Rename with content chane: http --timeout=3600 -j PATCH :3000/ada/repo0/ref/master/tree/my_test_renamed.txt data:='{"attributes": {"content": "abc", "encoding": "plain", "commit_message": "do something", "path": "my_test_renamed2.txt"}}' * Delete: http --timeout=3600 -j DELETE :3000/ada/repo0/ref/master/tree/my_test3.txt

…lass table inheritance.

Run all scpes except for the svn-tagged ones with: ``` rspec --tags ~svn ```

phyrog · 2017-04-18T07:03:12Z

app/models/repository_compound.rb

+    def wrap(repository)
+      return repository if repository.is_a?(RepositoryCompound)
+      unless repository.is_a?(Repository)
+        raise "Object given to ##{__method__} is not a repository"


This line is untested, which is OK, since it is only triggerd when we mess something up during development. So I would wrap this in nocov.

Done in 3f08fe2

phyrog · 2017-04-18T07:10:46Z

app/controllers/v2/resources_controller/dsl.rb

-          @collection = klass.where(parent_params).all
+          @collection = klass.where(parent_params)
+          if @collection.respond_to?(:all)
+            @collection = @collection.all


This is dead code for now (and untested), it should be used later. Leaving it untested and without nocov should be fine, so we don't forget about it.

phyrog · 2017-04-18T08:24:59Z

app/models/repository_compound.rb

+    @repository = Repository.new(*repository_params)
+  end
+
+  def save


This needs a transaction to not leave dead data in the database if creating a repository in the file system fails.

Done in 3f08fe2

phyrog · 2017-04-18T08:26:20Z

app/models/repository_compound.rb

+    true
+  end
+
+  def destroy


Same as with save. rmtree could fail and leave data in the file system.

ebolloff · 2017-04-18T11:23:13Z

app/models/blob.rb

+      @errors.add(:content, 'content must exist')
+    end
+    unless content.is_a?(String)
+      @errors.add(:content, 'content must be a String')


ebolloff · 2017-04-18T11:55:56Z

spec/controllers/v2/trees_controller_spec.rb

+        it { expect(response).to have_http_status(:ok) }
+        it { |example| expect([example, response]).to comply_with_api }
+
+        it 'moves the file and ' do


eugenk · 2017-04-19T07:15:56Z

I added a commit to upgrade to the current gitlab_git (v9.0.5). They changed the committing interface. Most of the added code was taken from the previous version of gitlab_git and restructured a little to fit in with the changes.

Run every spec example in a tempdir.

6a9ced1

eugenk requested review from phyrog and ebolloff April 12, 2017 17:16

eugenk added the in progress label Apr 12, 2017

eugenk force-pushed the 9-use_gitlab_git branch 3 times, most recently from eb12e5a to 3965af0 Compare April 12, 2017 20:50

eugenk added 5 commits April 14, 2017 14:38

Add basic git layer to clone, pull and commit.

244edf8

Add git-svn to travis.

6c256b0

Share repositories among examples to speed specs up

5cd7a54

Instead of 2:45 minutes, the specs take now about 37 seconds.

Add settings key for data path and add validations.

a91692c

Replace Repository by RepositoryCompound.

c502466

eugenk force-pushed the 9-use_gitlab_git branch from 3965af0 to 64b87bc Compare April 14, 2017 12:38

eugenk added 4 commits April 18, 2017 08:42

Create and destroy a Git along with a Repository.

218e769

Add rake task repo:clean to delete git repositories.

8297f83

Monkey-patch Rails to not remove double slashes in the routes as soon…

1897575

… as the routes have been loaded.

Add to_param, git and url methods to RepositoryCompound.

2f8f2e6

eugenk force-pushed the 9-use_gitlab_git branch 4 times, most recently from 6bd2760 to 4bef0a0 Compare April 18, 2017 07:04

eugenk added 8 commits April 18, 2017 09:41

Show trees.

f9974aa

Monkey-patch: Fix interaction of devise with orm_adapter-sequel for c…

4f32f3b

…lass table inheritance.

Tag svn-related specs

3558cda

Run all scpes except for the svn-tagged ones with: ``` rspec --tags ~svn ```

Add helper to sign in a user in the specs.

5fe6de6

Add specs for outer git layer.

6eb25db

Add git instances and files in the seeds.

fbbb2a7

Add git instances and files in the seeds.

6b8587b

eugenk force-pushed the 9-use_gitlab_git branch from 4bef0a0 to 6b8587b Compare April 18, 2017 07:42

phyrog requested changes Apr 18, 2017

View reviewed changes

ebolloff suggested changes Apr 18, 2017

View reviewed changes

Obey reviewers.

03b7019

eugenk force-pushed the 9-use_gitlab_git branch from 3f08fe2 to 03b7019 Compare April 18, 2017 12:08

Upgrade to gitlab_git from gitlab v9.0.5.

c63fa48

eugenk force-pushed the 9-use_gitlab_git branch from 56c9e07 to c63fa48 Compare April 19, 2017 07:24

phyrog approved these changes Apr 22, 2017

View reviewed changes

ebolloff approved these changes Apr 25, 2017

View reviewed changes

eugenk merged commit 21e9779 into master Apr 25, 2017

eugenk deleted the 9-use_gitlab_git branch April 25, 2017 06:22

eugenk removed the in progress label Apr 25, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

9 use gitlab git #102

9 use gitlab git #102

eugenk commented Apr 12, 2017 •

edited

Loading

phyrog Apr 18, 2017

eugenk Apr 18, 2017

phyrog Apr 18, 2017

phyrog Apr 18, 2017

eugenk Apr 18, 2017

phyrog Apr 18, 2017

ebolloff Apr 18, 2017

ebolloff Apr 18, 2017

eugenk commented Apr 19, 2017 •

edited

Loading

9 use gitlab git #102

9 use gitlab git #102

Conversation

eugenk commented Apr 12, 2017 • edited Loading

Usage

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eugenk commented Apr 19, 2017 • edited Loading

eugenk commented Apr 12, 2017 •

edited

Loading

eugenk commented Apr 19, 2017 •

edited

Loading