gitlab 3.3.0 → 3.4.0

data/spec/gitlab/client/projects_spec.rb

@@ -18,6 +18,24 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".project_search" do
+    before do
+      stub_get("/projects/search/Gitlab", "project_search")
+      @project_search = Gitlab.project_search("Gitlab")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/search/Gitlab")).to have_been_made
+    end
+
+    it "should return an array of projects found" do
+      expect(@project_search).to be_an Array
+      expect(@project_search.first.name).to eq("Gitlab")
+      expect(@project_search.first.owner.name).to eq("John Smith")
+    end
+
+  end
+
   describe ".project" do
     before do
       stub_get("/projects/3", "project")
@@ -260,17 +278,36 @@ describe Gitlab::Client do
   end
 
   describe ".delete_project_hook" do
-    before do
-      stub_delete("/projects/1/hooks/1", "project_hook")
-      @hook = Gitlab.delete_project_hook(1, 1)
-    end
+    context "when empty response" do
+      before do
+        stub_request(:delete, "#{Gitlab.endpoint}/projects/1/hooks/1").
+          with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
+          to_return(:body => '')
+        @hook = Gitlab.delete_project_hook(1, 1)
+      end
 
-    it "should get the correct resource" do
-      expect(a_delete("/projects/1/hooks/1")).to have_been_made
+      it "should get the correct resource" do
+        expect(a_delete("/projects/1/hooks/1")).to have_been_made
+      end
+
+      it "should return false" do
+        expect(@hook).to be(false)
+      end
     end
 
-    it "should return information about a deleted hook" do
-      expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+    context "when JSON response" do
+      before do
+        stub_delete("/projects/1/hooks/1", "project_hook")
+        @hook = Gitlab.delete_project_hook(1, 1)
+      end
+
+      it "should get the correct resource" do
+        expect(a_delete("/projects/1/hooks/1")).to have_been_made
+      end
+
+      it "should return information about a deleted hook" do
+        expect(@hook.url).to eq("https://api.example.net/v1/webhooks/ci")
+      end
     end
   end
 

data/spec/gitlab/client/repository_files_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Gitlab::Client do
+  describe ".create_file" do
+    let!(:request_stub) { stub_post("/projects/3/repository/files", "repository_file") }
+    let!(:file) { Gitlab.create_file(3, "path", "branch", "content", "commit message") }
+
+    it "should create the correct resource" do
+      expect(request_stub).to have_been_made
+    end
+
+    it "should return information about the new file" do
+      expect(file.file_path).to eq "path"
+      expect(file.branch_name).to eq "branch"
+    end
+  end
+
+  describe ".edit_file" do
+    let!(:request_stub) { stub_put("/projects/3/repository/files", "repository_file") }
+    let!(:file) { Gitlab.edit_file(3, "path", "branch", "content", "commit message") }
+
+    it "should create the correct resource" do
+      expect(request_stub).to have_been_made
+    end
+
+    it "should return information about the new file" do
+      expect(file.file_path).to eq "path"
+      expect(file.branch_name).to eq "branch"
+    end
+  end
+
+  describe ".remove_file" do
+    let!(:request_stub) { stub_delete("/projects/3/repository/files", "repository_file") }
+    let!(:file) { Gitlab.remove_file(3, "path", "branch", "commit message") }
+
+    it "should create the correct resource" do
+      expect(request_stub).to have_been_made
+    end
+
+    it "should return information about the new file" do
+      expect(file.file_path).to eq "path"
+      expect(file.branch_name).to eq "branch"
+    end
+  end
+end

data/spec/gitlab/help_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Gitlab::Help do
+
+  describe ".ri_cmd" do
+    context "ri command found" do
+      it "should return the path to RI" do
+        allow(Gitlab::Help).to receive(:`).with(/which ri/).and_return('/usr/bin/ri')
+        expect(Gitlab::Help.ri_cmd).to eq('/usr/bin/ri')
+      end
+    end
+
+    context "ri command NOT found" do
+      it "should raise" do
+        allow(Gitlab::Help).to receive(:`).with(/which ri/).and_return('')
+        expect{Gitlab::Help.ri_cmd}.to raise_error
+      end
+    end
+
+  end
+
+  describe ".change_help_output!" do
+    before do
+      @cmd = "create_branch"
+      @help_output = "Gitlab.#{@cmd}(4, 'new-branch', 'master')"
+    end
+    it "should return a String of modified output" do
+      Gitlab::Help.change_help_output! @cmd, @help_output
+      expect(@help_output).to eq("Gitlab.create_branch 4 'new-branch' 'master'")
+    end
+  end
+
+  describe ".namespace" do
+    before do
+      @cmd = 'create_tag'
+      @namespace = Gitlab::Help.namespace @cmd
+    end
+    it "should return the full namespace for a command" do
+      expect(@namespace).to be_a String
+      expect(@namespace).to eq("Gitlab::Client::Repositories.#{@cmd}")
+    end
+  end
+
+end

data/spec/gitlab/objectified_hash_spec.rb

@@ -21,6 +21,13 @@ describe Gitlab::ObjectifiedHash do
     end
   end
 
+  describe "#inspect" do
+    it "should return a formatted string" do
+      pretty_string = "#<#{@oh.class.name}:#{@oh.object_id} {hash: #{@hash.to_s}}"
+      expect(@oh.inspect).to eq(pretty_string)
+    end
+  end
+
   describe "#respond_to" do
     it "should return true for methods this object responds to through method_missing as sym" do
       expect(@oh.respond_to?(:a)).to be_truthy

data/spec/gitlab/request_spec.rb

@@ -5,6 +5,12 @@ describe Gitlab::Request do
   it { should respond_to :post }
   it { should respond_to :put }
   it { should respond_to :delete }
+  before do
+    @request = Gitlab::Request.new
+    @obj_h = Gitlab::ObjectifiedHash.new({user: ['not set'],
+                                          password: ['too short'],
+                                          embed_entity: { foo: ['bar'], sna: ['fu'] }})
+  end
 
   describe ".default_options" do
     it "should have default values" do
@@ -27,23 +33,56 @@ describe Gitlab::Request do
   describe "#set_request_defaults" do
     context "when endpoint is not set" do
       it "should raise Error::MissingCredentials" do
+        @request.endpoint = nil
         expect {
-          Gitlab::Request.new.set_request_defaults(nil, 1234000)
+          @request.set_request_defaults
         }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
       end
     end
 
     context "when endpoint is set" do
-      it "should set instance variable 'endpoint'" do
-        request = Gitlab::Request.new
-        request.set_request_defaults('http://rabbit-hole.example.org', 1234000)
-        expect(request.instance_variable_get(:@endpoint)).to eq("http://rabbit-hole.example.org")
+      before(:each) do
+        @request.endpoint = 'http://rabbit-hole.example.org'
       end
 
       it "should set default_params" do
-        Gitlab::Request.new.set_request_defaults('http://rabbit-hole.example.org', 1234000, 'sudoer')
+        @request.set_request_defaults('sudoer')
         expect(Gitlab::Request.default_params).to eq({:sudo => 'sudoer'})
       end
     end
   end
+
+  describe "#set_authorization_header" do
+    it "should raise MissingCredentials when auth_token and private_token are not set" do
+      expect {
+        @request.send(:set_authorization_header, {})
+      }.to raise_error(Gitlab::Error::MissingCredentials)
+    end
+
+    it "should set the correct header when given a private_token" do
+      @request.private_token = 'ys9BtunN3rDKbaJCYXaN'
+      expect(@request.send(:set_authorization_header, {})).to eq({"PRIVATE-TOKEN"=>'ys9BtunN3rDKbaJCYXaN'})
+    end
+
+    it "should set the correct header when setting an auth_token via the private_token config option" do
+      @request.private_token = '3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603'
+      expect(@request.send(:set_authorization_header, {})).to eq({"Authorization"=>"Bearer 3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603"})
+    end
+  end
+
+  describe "#handle_error" do
+    context "when passed an ObjectifiedHash" do
+      it "should return a joined string of error messages sorted by key" do
+        expect(@request.send(:handle_error, @obj_h)).to eq("'embed_entity' (foo: bar) (sna: fu), 'password' too short, 'user' not set")
+      end
+    end
+
+    context "when passed a String" do
+      it "should return the String untouched" do
+        error = 'this is an error string'
+        expect(@request.send(:handle_error, error)).to eq('this is an error string')
+      end
+    end
+  end
+
 end

data/spec/gitlab/shell_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Gitlab::Shell do
+  before do
+    Gitlab::Shell.setup
+  end
+
+  describe ".execute" do
+    context "invalid command" do
+      it "should raise" do
+        expect{Gitlab::Shell.execute 'foobar', []}.to raise_error(RuntimeError)
+      end
+    end
+  end
+
+  describe ".history" do
+    before do
+      @history = Gitlab::Shell.history
+    end
+
+    it "should return a Gitlab::Shell::History instance" do
+      expect(@history).to be_a Gitlab::Shell::History
+    end
+    it "should respond to :save" do
+      expect(@history).to respond_to :save
+    end
+    it "should respond to :load" do
+      expect(@history).to respond_to :load
+    end
+    it "should respond to :<<" do
+      expect(@history).to respond_to :<<
+    end
+  end
+
+  describe ".setup" do
+    it "should set the Readline completion_proc" do
+      completion = Readline.completion_proc
+      expect(completion).to be_truthy
+      expect(completion).to be_a Proc
+    end
+    it "should set the Readline completion_append_character" do
+      completion_character = Readline.completion_append_character
+      expect(completion_character).to eq(' ')
+    end
+  end
+
+  describe ".completion" do
+    before do
+      @comp = Gitlab::Shell.completion
+    end
+    it "should return a Proc object" do
+      expect(@comp).to be_a Proc
+    end
+    context "called with an argument" do
+      it "should return an Array of matching commands" do
+        completed_cmds = @comp.call 'group'
+        expect(completed_cmds).to be_a Array
+        expect(completed_cmds.sort).to eq(['group', 'group_members', 'groups'])
+      end
+    end
+  end
+
+  describe ".parse_input" do
+    context "with arguments" do
+      it "should set command & arguements" do
+        Gitlab::Shell.parse_input('create_branch 1 "api" "master"') 
+        expect(Gitlab::Shell.command).to eq('create_branch')
+        expect(Gitlab::Shell.arguments).to eq(['1', 'api', 'master'])
+      end
+    end
+      
+    context "without arguments" do
+      it 'should set command & empty arguments' do
+        Gitlab::Shell.parse_input('exit') 
+        expect(Gitlab::Shell.command).to eq('exit')
+        expect(Gitlab::Shell.arguments).to be_empty
+      end
+    end
+  end
+end

data/spec/gitlab_spec.rb

@@ -16,6 +16,11 @@ describe Gitlab do
       expect(client1.private_token).to eq('001')
       expect(client2.private_token).to eq('002')
     end
+
+    it "should set private_token to the auth_token when provided" do
+      client = Gitlab.client(endpoint: 'https://api2.example.com', auth_token: '3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603')
+      expect(client.private_token).to eq('3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603')
+    end
   end
 
   describe ".actions" do
@@ -41,6 +46,13 @@ describe Gitlab do
     end
   end
 
+  describe ".auth_token=" do
+    it "should set auth_token", focus: true do
+      Gitlab.auth_token = 'auth_secret'
+      expect(Gitlab.private_token).to eq('auth_secret')
+    end
+  end
+
   describe ".sudo=" do
     it "should set sudo" do
       Gitlab.sudo = 'user'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -111,6 +112,7 @@ files:
 - lib/gitlab/client/notes.rb
 - lib/gitlab/client/projects.rb
 - lib/gitlab/client/repositories.rb
+- lib/gitlab/client/repository_files.rb
 - lib/gitlab/client/snippets.rb
 - lib/gitlab/client/system_hooks.rb
 - lib/gitlab/client/users.rb
@@ -123,6 +125,7 @@ files:
 - lib/gitlab/shell_history.rb
 - lib/gitlab/version.rb
 - spec/fixtures/branch.json
+- spec/fixtures/branch_delete.json
 - spec/fixtures/branches.json
 - spec/fixtures/compare_merge_request_diff.json
 - spec/fixtures/error_already_exists.json
@@ -139,10 +142,12 @@ files:
 - spec/fixtures/label.json
 - spec/fixtures/labels.json
 - spec/fixtures/merge_request.json
+- spec/fixtures/merge_request_changes.json
 - spec/fixtures/merge_request_comment.json
 - spec/fixtures/merge_request_comments.json
 - spec/fixtures/merge_requests.json
 - spec/fixtures/milestone.json
+- spec/fixtures/milestone_issues.json
 - spec/fixtures/milestones.json
 - spec/fixtures/note.json
 - spec/fixtures/notes.json
@@ -160,11 +165,13 @@ files:
 - spec/fixtures/project_issues.json
 - spec/fixtures/project_key.json
 - spec/fixtures/project_keys.json
+- spec/fixtures/project_search.json
 - spec/fixtures/project_tag_annotated.json
 - spec/fixtures/project_tag_lightweight.json
 - spec/fixtures/project_tags.json
 - spec/fixtures/projects.json
 - spec/fixtures/raw_file.json
+- spec/fixtures/repository_file.json
 - spec/fixtures/session.json
 - spec/fixtures/shell_history.json
 - spec/fixtures/snippet.json
@@ -176,6 +183,7 @@ files:
 - spec/fixtures/tree.json
 - spec/fixtures/user.json
 - spec/fixtures/users.json
+- spec/gitlab/cli_helpers_spec.rb
 - spec/gitlab/cli_spec.rb
 - spec/gitlab/client/branches_spec.rb
 - spec/gitlab/client/groups_spec.rb
@@ -186,12 +194,15 @@ files:
 - spec/gitlab/client/notes_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb
+- spec/gitlab/client/repository_files_spec.rb
 - spec/gitlab/client/snippets_spec.rb
 - spec/gitlab/client/system_hooks_spec.rb
 - spec/gitlab/client/users_spec.rb
+- spec/gitlab/help_spec.rb
 - spec/gitlab/objectified_hash_spec.rb
 - spec/gitlab/request_spec.rb
 - spec/gitlab/shell_history_spec.rb
+- spec/gitlab/shell_spec.rb
 - spec/gitlab_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/narkoz/gitlab
@@ -213,12 +224,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper and CLI for the GitLab API
 test_files:
 - spec/fixtures/branch.json
+- spec/fixtures/branch_delete.json
 - spec/fixtures/branches.json
 - spec/fixtures/compare_merge_request_diff.json
 - spec/fixtures/error_already_exists.json
@@ -235,10 +247,12 @@ test_files:
 - spec/fixtures/label.json
 - spec/fixtures/labels.json
 - spec/fixtures/merge_request.json
+- spec/fixtures/merge_request_changes.json
 - spec/fixtures/merge_request_comment.json
 - spec/fixtures/merge_request_comments.json
 - spec/fixtures/merge_requests.json
 - spec/fixtures/milestone.json
+- spec/fixtures/milestone_issues.json
 - spec/fixtures/milestones.json
 - spec/fixtures/note.json
 - spec/fixtures/notes.json
@@ -256,11 +270,13 @@ test_files:
 - spec/fixtures/project_issues.json
 - spec/fixtures/project_key.json
 - spec/fixtures/project_keys.json
+- spec/fixtures/project_search.json
 - spec/fixtures/project_tag_annotated.json
 - spec/fixtures/project_tag_lightweight.json
 - spec/fixtures/project_tags.json
 - spec/fixtures/projects.json
 - spec/fixtures/raw_file.json
+- spec/fixtures/repository_file.json
 - spec/fixtures/session.json
 - spec/fixtures/shell_history.json
 - spec/fixtures/snippet.json
@@ -272,6 +288,7 @@ test_files:
 - spec/fixtures/tree.json
 - spec/fixtures/user.json
 - spec/fixtures/users.json
+- spec/gitlab/cli_helpers_spec.rb
 - spec/gitlab/cli_spec.rb
 - spec/gitlab/client/branches_spec.rb
 - spec/gitlab/client/groups_spec.rb
@@ -282,11 +299,14 @@ test_files:
 - spec/gitlab/client/notes_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb
+- spec/gitlab/client/repository_files_spec.rb
 - spec/gitlab/client/snippets_spec.rb
 - spec/gitlab/client/system_hooks_spec.rb
 - spec/gitlab/client/users_spec.rb
+- spec/gitlab/help_spec.rb
 - spec/gitlab/objectified_hash_spec.rb
 - spec/gitlab/request_spec.rb
 - spec/gitlab/shell_history_spec.rb
+- spec/gitlab/shell_spec.rb
 - spec/gitlab_spec.rb
 - spec/spec_helper.rb