bamboo-client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38822888e09b2105e0e6142f35de3a5f4fa11fa6
-  data.tar.gz: 9567bc374446f4c83212ab531123a992fd09e21e
+  metadata.gz: 224a6b075dd5f763b1ad322838359cc57b9c089d
+  data.tar.gz: 66e9493a34ffbb55a0824e528e2880f137b895bc
 SHA512:
-  metadata.gz: e8ccba78195cb35cc858d321e55e1206e9ad615e44c65c551a3dce3af1d56946ee69a47b67f6a991b747af181fe9d4769f21a620803cd687dc62b7fdc3db2e8e
-  data.tar.gz: 0f8da5377be315763cfcdc6c15fc3bfaee098bebe97a3cb97013ec1e7be3f310554fbdaf3f2e26d12b79a3708622a57dc2afd3318018bcd1c5e3d95bf868e18e
+  metadata.gz: acabe3c2d0be4778d1bb148bde7ef10f63147aefe9a9fb51481f97e4f9bc4c8433c7ca9b90caace18a169dd6f24adda439ce642026bbe38a7cb11dffe1aed374
+  data.tar.gz: 6c96bdb30aa662164dcf38cb3a3f786dab380675ccb635651db6c6a0d9d66094c4d2acea498cbc6e9c122478d1f54175057c30efe3bcfecdf2b22cc057d4093b

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Jari Bakken
+Copyright (c) 2010-2014 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/bamboo-client/http/json.rb

@@ -41,19 +41,20 @@ module Bamboo
 
         attr_reader :cookies
 
-        def post(uri_or_path, data = {}, cookies = nil)
-          resp = RestClient.post(uri_for(uri_or_path), data.to_json, :accept => :json, :content_type => :json, :cookies => cookies)
+        def post(uri_or_path, data = {})
+          resp = RestClient.post(uri_for(uri_or_path), data.to_json, default_headers.merge(:content_type => :json))
           Doc.from(resp) unless resp.empty?
         end
 
-        def post_with_query(uri_or_path, query = {}, cookies = nil)
-          resp = RestClient.post(uri_for(uri_or_path, query), '{}', :accept => :json, :content_type => :json, :cookies => cookies)
+        def post_with_query(uri_or_path, query = {})
+          resp = RestClient.post(uri_for(uri_or_path, query), '{}', default_headers.merge(:content_type => :json))
           Doc.from(resp) unless resp.empty?
         end
 
-        def get(uri_or_path, params = nil, cookies = nil)
+        def get(uri_or_path, params = nil)
           uri = uri_for(uri_or_path, params)
-          Doc.from RestClient.get(uri, :accept => :json, :cookies => cookies)
+          puts "Json.get: url: #{uri} cookies: #{cookies}" if $DEBUG
+          Doc.from RestClient.get(uri, default_headers)
         end
 
         def get_cookies(uri_or_path, params = nil)
@@ -62,6 +63,15 @@ module Bamboo
           @cookies = resp.cookies
         end
 
+        private
+
+        def default_headers
+          params = { :accept => :json }
+          params[:cookies] = @cookies if @cookies
+
+          params
+        end
+
       end # Json
     end # Http
   end # Client

data/lib/bamboo-client/rest.rb

@@ -93,14 +93,14 @@ module Bamboo
           path = File.join(SERVICE, "queue/#{URI.escape key}")
 
           if params
-            @http.post_with_query path, params, @http.cookies
+            @http.post_with_query path, params
           else
-            @http.post path, {}, @http.cookies
+            @http.post path, {}
           end
         end
 
-        def results
-          doc = @http.get File.join(SERVICE, "result/#{URI.escape key}"), {}, @http.cookies
+        def results(params = {})
+          doc = @http.get File.join(SERVICE, "result/#{URI.escape key}"), params
           doc.auto_expand Result, @http
         end
 
@@ -131,7 +131,7 @@ module Bamboo
         def plans
           @plans ||= (
             unless @data['plans'] && @data['plans']['plan']
-              @data = @http.get(URI.parse(url), {:expand => 'plans'}, @http.cookies).data
+              @data = @http.get(URI.parse(url), :expand => 'plans').data
             end
 
             @data.fetch('plans').fetch('plan').map { |e| Plan.new(e, @http) }
@@ -256,6 +256,10 @@ module Bamboo
           @data['comment']
         end
 
+        def commit_url
+          @data['commitUrl']
+        end
+
         def files
           # could use expand here
           Array(@data.fetch('files')['file']).map do |data|
@@ -280,14 +284,14 @@ module Bamboo
         end
 
         def add(key)
-          data = @http.post(File.join(SERVICE, "queue/#{URI.escape key}"), {}, @http.cookies).data
+          data = @http.post(File.join(SERVICE, "queue/#{URI.escape key}"), {}).data
           QueuedBuild.new(data, @http)
         end
 
         def queued_builds
           @queued_builds ||= (
             unless @data['queuedBuilds'] && @data['queuedBuilds']['queuedBuild']
-              @data = @http.get(File.join(SERVICE, 'queue'), {:expand => 'queuedBuilds'}, @http.cookies).data
+              @data = @http.get(File.join(SERVICE, 'queue'), {:expand => 'queuedBuilds'}).data
             end
 
             begin
@@ -332,7 +336,7 @@ module Bamboo
         def changes
           @changes ||= (
             unless @data['changes'] && @data['changes']['change']
-              @data = @http.get(URI.parse(url), {:expand => 'changes'}, @http.cookies).data
+              @data = @http.get(URI.parse(url), {:expand => 'changes'}).data
             end
 
             @data.fetch('changes').fetch('change').map { |e| Change.new(e, @http) }

data/lib/bamboo-client/version.rb

@@ -1,5 +1,5 @@
 module Bamboo
   module Client
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/spec/bamboo-client/http/json_spec.rb

@@ -9,7 +9,7 @@ module Bamboo
 
         it "does a GET" do
           RestClient.should_receive(:get).with(
-            "#{url}/", :accept => :json, :cookies => nil
+            "#{url}/", :accept => :json
             ).and_return('{"some": "data"}')
 
           doc = json.get "/"
@@ -18,7 +18,7 @@ module Bamboo
 
         it "does a POST" do
           RestClient.should_receive(:post).with(
-            "#{url}/", '{"some":"data"}', :accept => :json, :content_type => :json, :cookies => nil
+            "#{url}/", '{"some":"data"}', :accept => :json, :content_type => :json
             ).and_return('')
 
           json.post("/", :some => "data").should be_nil
@@ -26,18 +26,23 @@ module Bamboo
 
         it 'does a POST with query instead of JSON data' do
           RestClient.should_receive(:post).with(
-            "#{url}/?some=data", '{}', :accept => :json, :content_type => :json, :cookies => nil
+            "#{url}/?some=data", '{}', :accept => :json, :content_type => :json
             ).and_return('')
 
           json.post_with_query("/", :some => "data").should be_nil
         end
 
         it "returns cookies from GET" do
-          net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
-          net_http_resp.add_field 'Set-Cookie', 'Cookie=Value;'
-          resp = RestClient::Response.create("",net_http_resp, nil)
+          resp = '{}'
+          def resp.cookies; {'Cookie' => 'Value'}; end
+
           RestClient.should_receive(:get).with("#{url}/", :params => nil).and_return(resp)
-          cookies = json.get_cookies("/").should  == {'Cookie' => 'Value'}
+
+          cookies = json.get_cookies("/")
+          cookies.should  == {'Cookie' => 'Value'}
+
+          RestClient.should_receive(:get).with("#{url}/", :accept => :json, :cookies => cookies).and_return('{}')
+          json.get('/').should be_kind_of(Json::Doc)
         end
 
       end

data/spec/bamboo-client/rest_spec.rb

@@ -110,21 +110,18 @@ module Bamboo
         end
 
         it "can be queued" do
-          http.should_receive(:cookies).and_return("some" => "cookie")
-          http.should_receive(:post).with("/rest/api/latest/queue/S2RB-REMWIN", {}, {"some" => "cookie"})
+          http.should_receive(:post).with("/rest/api/latest/queue/S2RB-REMWIN", {})
           plan.queue
         end
 
         it "can be queued with parameters" do
-          http.should_receive(:cookies).and_return("some" => "cookie")
-          http.should_receive(:post_with_query).with("/rest/api/latest/queue/S2RB-REMWIN", {:customRevision => 'test123'}, {"some" => "cookie"})
+          http.should_receive(:post_with_query).with("/rest/api/latest/queue/S2RB-REMWIN", {:customRevision => 'test123'})
           plan.queue(:customRevision => 'test123')
         end
 
         it 'can fetch results' do
           document.should_receive(:auto_expand).with(Rest::Result, http)
-          http.should_receive(:cookies).and_return("some" => "cookie")
-          http.should_receive(:get).with("/rest/api/latest/result/S2RB-REMWIN", {}, {"some" => "cookie"}).and_return(document)
+          http.should_receive(:get).with("/rest/api/latest/result/S2RB-REMWIN", {}).and_return(document)
 
           plan.results
         end
@@ -148,8 +145,7 @@ module Bamboo
 
         it 'can fetch plans' do
           document.should_receive(:data).and_return('plans' => {'plan' => []})
-          http.should_receive(:cookies).and_return("some" => "cookie")
-          http.should_receive(:get).with(URI.parse(project.url), {:expand => 'plans'}, {"some" => "cookie"}).and_return(document)
+          http.should_receive(:get).with(URI.parse(project.url), {:expand => 'plans'}).and_return(document)
 
           project.plans.should == []
         end
@@ -195,6 +191,7 @@ module Bamboo
         context "with details" do
           before do
             # TODO: arg/uri expectation?
+            http.stub(:cookies => {"some" => "cookie"})
             http.should_receive(:get).and_return Http::Json::Doc.new(json_fixture("result_with_changes"))
           end
 
@@ -258,6 +255,9 @@ module Bamboo
           change.comment.should == "Fixed the config thing."
         end
 
+        it "has a commit url" do
+          change.commit_url.should == "https://crucible/changelog/SVN?cs=1101"
+        end
         it "has a list of files" do
           change.files.first.should == {:name => "/trunk/server/src/main/resources/some-config.ini", :revision => "131"}
         end
@@ -273,19 +273,16 @@ module Bamboo
 
         it "has a list of queued builds when there are queued builds" do
           http.should_receive(:get).and_return Http::Json::Doc.new(json_fixture("queue_with_queued_builds"))
-          http.should_receive(:cookies).and_return("some" => "cookie")
           queue.queued_builds.first.should be_kind_of(Rest::QueuedBuild)
         end
 
         it "has an empty list when there are no queued builds" do
           http.should_receive(:get).and_return Http::Json::Doc.new(json_fixture("queue_with_no_queued_builds"))
-          http.should_receive(:cookies).and_return("some" => "cookie")
           queue.queued_builds.should be_empty
         end
 
         it "can add plan to queue" do
-          http.should_receive(:cookies).and_return("some" => "cookie")
-          http.should_receive(:post).with("/rest/api/latest/queue/DEMOPROJECT-CANARY", {}, {"some" => "cookie"}).and_return Http::Json::Doc.new(json_fixture("queued_build"))
+          http.should_receive(:post).with("/rest/api/latest/queue/DEMOPROJECT-CANARY", {}).and_return Http::Json::Doc.new(json_fixture("queued_build"))
           queue.add("DEMOPROJECT-CANARY").should be_kind_of(Rest::QueuedBuild)
         end
       end

data/spec/fixtures/change.json

@@ -6,6 +6,7 @@
   "expand": "files",
   "comment": "Fixed the config thing.",
   "date": "2011-01-20T10:04:47.000+01:00",
+  "commitUrl": "https://crucible/changelog/SVN?cs=1101",
   "files": {
     "size": 1,
     "max-result": 1,

data/spec/fixtures/result_with_changes.json

@@ -54,6 +54,7 @@
         "expand": "files",
         "comment": "Fixed the config thing.",
         "date": "2011-01-20T10:04:47.000+01:00",
+        "commitUrl": "https://crucible/changelog/SVN?cs=1101",
         "files": {
           "size": 1,
           "max-result": 1,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bamboo-client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jari Bakken
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client for Atlassian Bamboo's REST APIs
@@ -117,9 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README
@@ -166,17 +166,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bamboo-client
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby client for Atlassian Bamboo's REST APIs
@@ -203,3 +203,4 @@ test_files:
 - spec/fixtures/result.json
 - spec/fixtures/result_with_changes.json
 - spec/spec_helper.rb
+has_rdoc: