bamboo-client 0.0.6 → 0.0.8

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/LICENSE

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

data/Rakefile

@@ -9,4 +9,4 @@ Cucumber::Rake::Task.new do |t|
   t.profile = 'default'
 end
 
-task :default => [:spec, :cucumber]
+task :default => :spec

data/bamboo-client.gemspec

@@ -6,17 +6,18 @@ Gem::Specification.new do |s|
   s.name        = "bamboo-client"
   s.version     = Bamboo::Client::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jari Bakken"]
-  s.email       = ["jari.bakken@gmail.com"]
+  s.authors     = ["Jari Bakken", "Peter Marsh"]
+  s.email       = ["jari.bakken@gmail.com", "pete.d.marsh@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{Ruby client for Atlassian Bamboo's REST APIs}
   s.description = %q{Ruby client for Atlassian Bamboo's REST APIs}
 
   s.rubyforge_project = "bamboo-client"
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "cucumber", ">= 0.10.0"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "rake", "~> 0.9"
 
   s.add_dependency "rest-client"
   s.add_dependency "json"

data/features/rest.feature

@@ -20,3 +20,10 @@ Feature: Bamboo REST client
     When I fetch all builds
     Then I should get a list of builds
     And all builds should have a state
+  
+  Scenario: Authenticated API
+    When I log in
+    Then I should get a session ID
+    When I fetch all the plans
+    Then I should get a list of plans
+    And all plans should have a key

data/features/step_definitions/rest_steps.rb

@@ -31,3 +31,11 @@ end
 Then /^all builds should have a state$/ do
   @builds.each { |b| [:successful, :failed].should include(b.state) }
 end
+
+When /^I log in$/ do
+  client.login user, password
+end
+
+Then /^I should get a session ID$/ do
+  client.cookies.has_key? :JSESSIONID
+end

data/features/step_definitions/rest_steps.rb~

@@ -0,0 +1,38 @@
+When /^I fetch all the plans$/ do
+  @plans = client.plans
+end
+
+Then /^I should get a list of plans$/ do
+  @plans.should_not be_empty
+  @plans.each { |plan| plan.should be_kind_of(Bamboo::Client::Rest::Plan) }
+end
+
+When /^I fetch all projects$/ do
+  @projects = client.projects
+end
+
+Then /^I should get a list of projects$/ do
+  @projects.should_not be_empty
+  @projects.each { |pro| pro.should be_kind_of(Bamboo::Client::Rest::Project) }
+end
+
+Then /^all plans should have a key$/ do
+  @plans.each { |e| e.key.should be_kind_of(String) }
+end
+
+Then /^all projects should have a key$/ do
+  @projects.each { |e| e.key.should be_kind_of(String) }
+end
+
+When /^I fetch all builds$/ do
+  @builds = client.builds
+end
+
+Then /^all builds should have a state$/ do
+  @builds.each { |b| [:successful, :failed].should include(b.state) }
+end
+
+When /^I login to in with my credentials, (.*) and (.*)$/ do |username, password|
+  client.login(username, password)
+  client.cookies != nil
+end

data/features/support/env.rb

@@ -2,6 +2,7 @@ $:.unshift File.expand_path("../../../lib", __FILE__)
 require "bamboo-client"
 
 $DEBUG = false
+RestClient.log = STDERR if false
 
 module BambooClientHelper
   attr_reader :client

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

@@ -13,7 +13,6 @@ module Bamboo
 
           def initialize(data)
             @data = data
-
             pp @data if $DEBUG
           end
 
@@ -40,14 +39,20 @@ module Bamboo
           end
         end # Doc
 
-        def post(uri_or_path, data = {})
-          resp = RestClient.post(uri_for(uri_or_path), data.to_json, :accept => :json, :content_type => :json)
+        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)
           Doc.from(resp) unless resp.empty?
         end
 
-        def get(uri_or_path, params = nil)
+        def get(uri_or_path, params = nil, cookies = nil)
           uri = uri_for(uri_or_path, params)
-          Doc.from RestClient.get(uri, :accept => :json)
+          Doc.from RestClient.get(uri, :accept => :json, :cookies => cookies)
+        end
+
+        def get_cookies(uri_or_path, params = nil)
+          uri = uri_for(uri_or_path, nil)
+          resp = RestClient.get(uri, :params => params)
+          resp.cookies
         end
 
       end # Json

data/lib/bamboo-client/rest.rb

@@ -8,10 +8,25 @@ module Bamboo
     #
 
     class Rest < Abstract
+      
+      attr_reader :cookies
+
       SERVICE = "/rest/api/latest"
 
       def initialize(http)
         super
+        @cookies = nil
+      end
+
+      def login(username, password)
+        url = File.join(SERVICE, 'plan')
+        resp = @http.get_cookies(url, {
+                                        :os_authType => 'basic', 
+                                        :os_username => username, 
+                                        :os_password => password
+                                        }
+                                  )
+        @cookies = {:JSESSIONID => resp['JSESSIONID']}
       end
 
       def plans
@@ -28,8 +43,8 @@ module Bamboo
 
       private
 
-      def get(what)
-        @http.get File.join(SERVICE, what)
+      def get(what, params = nil)
+        @http.get File.join(SERVICE, what), params, @cookies
       end
 
       class Plan

data/lib/bamboo-client/version.rb

@@ -1,5 +1,5 @@
 module Bamboo
   module Client
-    VERSION = "0.0.6"
+    VERSION = "0.0.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
+            "#{url}/", :accept => :json, :cookies => nil
             ).and_return('{"some": "data"}')
 
           doc = json.get "/"
@@ -18,11 +18,20 @@ module Bamboo
 
         it "does a POST" do
           RestClient.should_receive(:post).with(
-            "#{url}/", '{"some":"data"}', :accept => :json, :content_type => :json
+            "#{url}/", '{"some":"data"}', :accept => :json, :content_type => :json, :cookies => nil
             ).and_return('')
 
           json.post("/", :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)
+          RestClient.should_receive(:get).with("#{url}/", :params => nil).and_return(resp)
+          cookies = json.get_cookies("/").should  == {'Cookie' => 'Value'}
+        end
+
       end
 
       describe Json::Doc do

data/spec/bamboo-client/remote_spec.rb

@@ -214,12 +214,12 @@ module Bamboo
         end
 
         it "returns nil if start time can not be parsed" do
-          doc.stub(:css).and_return mock(:text => "foo")
+          doc.stub(:css).and_return mock(:text => "Sun Sep 32")
           result.start_time.should be_nil
         end
 
         it "returns nil if start time can not be parsed" do
-          doc.stub(:css).and_return mock(:text => "foo")
+          doc.stub(:css).and_return mock(:text => "Sun Sep 32")
           result.end_time.should be_nil
         end
 

data/spec/bamboo-client/rest_spec.rb

@@ -7,11 +7,24 @@ module Bamboo
       let(:document) { mock(Http::Json::Doc) }
       let(:client) { Rest.new(http) }
 
+      it "logs in" do
+        username = 'something'
+        password = 'somethingelse'
+        http.should_receive(:get_cookies).with(
+          '/rest/api/latest/plan', 
+          {:os_authType => 'basic', :os_username => username, :os_password => password}).
+          and_return({'JSESSIONID' => '1'})
+        client.login username, password
+        client.cookies.should == { :JSESSIONID => '1'}
+      end
+
       it "should be able to fetch plans" do
         document.should_receive(:auto_expand).with(Rest::Plan, http).and_return %w[foo bar]
 
         http.should_receive(:get).with(
-          "/rest/api/latest/plan/"
+          "/rest/api/latest/plan/",
+          nil,
+          nil
         ).and_return(document)
 
         client.plans.should == %w[foo bar]
@@ -20,7 +33,7 @@ module Bamboo
       it "should be able to fetch projects" do
         document.should_receive(:auto_expand).with(Rest::Project, http).and_return %w[foo bar]
 
-        http.should_receive(:get).with("/rest/api/latest/project/").
+        http.should_receive(:get).with("/rest/api/latest/project/", nil, nil).
                                   and_return(document)
 
         client.projects.should == %w[foo bar]
@@ -29,7 +42,7 @@ module Bamboo
       it "should be able to fetch builds" do
         document.should_receive(:auto_expand).with(Rest::Build, http).and_return %w[foo bar]
 
-        http.should_receive(:get).with("/rest/api/latest/build/").
+        http.should_receive(:get).with("/rest/api/latest/build/", nil, nil).
                                   and_return(document)
 
         client.builds.should == %w[foo bar]

metadata

@@ -1,17 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: bamboo-client
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 0.0.6
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jari Bakken
+- Peter Marsh
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
-default_executable: 
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -19,9 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,6 +41,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
   type: :development
   version_requirements: *id002
@@ -43,45 +57,73 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rest-client
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: Ruby client for Atlassian Bamboo's REST APIs
 email: 
 - jari.bakken@gmail.com
+- pete.d.marsh@gmail.com
 executables: []
 
 extensions: []
@@ -91,6 +133,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README
@@ -101,6 +144,7 @@ files:
 - features/rest.feature
 - features/step_definitions/remote_steps.rb
 - features/step_definitions/rest_steps.rb
+- features/step_definitions/rest_steps.rb~
 - features/support/env.rb
 - lib/bamboo-client.rb
 - lib/bamboo-client/abstract.rb
@@ -124,7 +168,6 @@ files:
 - spec/fixtures/plan.json
 - spec/fixtures/project.json
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -138,17 +181,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: bamboo-client
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby client for Atlassian Bamboo's REST APIs
@@ -157,6 +206,7 @@ test_files:
 - features/rest.feature
 - features/step_definitions/remote_steps.rb
 - features/step_definitions/rest_steps.rb
+- features/step_definitions/rest_steps.rb~
 - features/support/env.rb
 - spec/bamboo-client/client_spec.rb
 - spec/bamboo-client/http/json_spec.rb
@@ -171,3 +221,4 @@ test_files:
 - spec/fixtures/plan.json
 - spec/fixtures/project.json
 - spec/spec_helper.rb
+has_rdoc: