rally_api 0.9.25 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97d9fae3df897057f75804abbf772c5112ad567
-  data.tar.gz: 50f0ff82c855619e78e50dcd6868a3dc58df5b0f
+  metadata.gz: 3dc909010959f93625ac7ef070f8650456279deb
+  data.tar.gz: 7134c5cad3d07742da655cb4a3a2ab07f1da192a
 SHA512:
-  metadata.gz: 7f8aa6bdb5942c83ea78249ababd1fd5bca6c28cfe6d7f811ee74c0b9b817b46a0ac6d3a000cb88c162061b3bfb962f340b19c454605ebdf99e09a2ba83f4eaf
-  data.tar.gz: 287c379896d12f03c440c32afea34a42cad884e024151dd54f124ab70c7516e269963d70c3479fb341e25e3201085f4c1c807c3e5a01732f73ed9651dedd38f9
+  metadata.gz: fead7450a8b3b5dd2f7441c62031d6d1b03da1a030cd07711f7d9b8b5fcb33ac629f1b28fc0f6938e3fbee310346e7e30bb92f141058309c384160447b6bc2e7
+  data.tar.gz: 78b9a05acc5daaee15b5a0111afd85f66d4aea7a9d3199a7c2719df0fd3e37602e9237cea869e2f4b2822be15997b93d0de3d910c79f22da1484fb8205a540c6

data/lib/rally_api/rally_json_connection.rb

@@ -42,9 +42,12 @@ module RallyAPI
       @find_threads = 4
     end
 
-    def set_client_user(base_url, user, password)
-      @rally_http_client.set_auth(base_url, user, password)
-      @rally_http_client.www_auth.basic_auth.challenge(base_url)  #force httpclient to put basic on first req to rally
+    def set_auth(auth_info)
+      if auth_info[:api_key].nil?
+        set_client_user(auth_info[:base_url], auth_info[:username], auth_info[:password])
+      else
+        set_api_key(auth_info)
+      end
     end
 
     def set_ssl_verify_mode(mode = OpenSSL::SSL::VERIFY_NONE)
@@ -124,7 +127,7 @@ module RallyAPI
       url_params[:key] = @security_token unless @security_token.nil?
       req_args[:query] = url_params if url_params.keys.length > 0
 
-      req_headers = @rally_headers.headers
+      req_headers = setup_request_headers
       if (args[:method] == :post) || (args[:method] == :put)
         req_headers["Content-Type"] = "application/json"
         req_headers["Accept"] = "application/json"
@@ -173,6 +176,25 @@ module RallyAPI
 
     private
 
+    def setup_request_headers()
+      req_headers = @rally_headers.headers
+      zsession_c = @rally_http_client.cookies.find {|c| c.name == "ZSESSIONID" }
+      if !@api_key.nil? && zsession_c.nil?
+        req_headers[:zsessionid] = @api_key
+      end
+      req_headers
+    end
+
+    def set_client_user(base_url, user, password)
+      @rally_http_client.set_auth(base_url, user, password)
+      @rally_http_client.www_auth.basic_auth.challenge(base_url)  #force httpclient to put basic on first req to rally
+    end
+
+    def set_api_key(auth_info)
+      @api_key_url  = auth_info[:base_url]
+      @api_key      = auth_info[:api_key]
+    end
+
     def run_threads(query_array)
       num_threads = @find_threads
       thr_queries = []

data/lib/rally_api/rally_rest_json.rb

@@ -44,9 +44,9 @@ module RallyAPI
 
   #Main Class to instantiate when using the tool
   class RallyRestJson
-    DEFAULT_WSAPI_VERSION = "1.42"
+    DEFAULT_WSAPI_VERSION = "1.43"
 
-    attr_accessor :rally_url, :rally_user, :rally_password, :rally_workspace_name, :rally_project_name, :wsapi_version,
+    attr_accessor :rally_url, :rally_workspace_name, :rally_project_name, :wsapi_version,
                   :rally_headers, :rally_default_workspace, :rally_default_project, :low_debug, :proxy_info,
                   :rally_rest_api_compat, :logger, :rally_alias_types
     attr_reader   :rally_connection, :custom_fields_for_type
@@ -54,9 +54,12 @@ module RallyAPI
     def initialize(args)
       pre_init()
 
-      @rally_url            = args[:base_url] || "https://rally1.rallydev.com/slm"
-      @rally_user           = args[:username]
-      @rally_password       = args[:password]
+      auth_info = {}
+
+      auth_info[:base_url]  = @rally_url = args[:base_url] || "https://rally1.rallydev.com/slm"
+      auth_info[:username]  = args[:username]
+      auth_info[:password]  = args[:password]
+      auth_info[:api_key]   = args[:api_key]
       @rally_workspace_name = args[:workspace]
       @rally_project_name   = args[:project]
       @wsapi_version        = args[:version]  || DEFAULT_WSAPI_VERSION
@@ -71,10 +74,11 @@ module RallyAPI
       @logger    = args[:logger] || nil    #assumes this is an instance of Logger
 
       @rally_connection = RallyJsonConnection.new(@rally_headers, @low_debug, @proxy_info)
-      @rally_connection.set_client_user(@rally_url, @rally_user, @rally_password)
+      #@rally_connection.set_client_user(@rally_url, @rally_user, @rally_password)
+      @rally_connection.set_auth(auth_info)
       @rally_connection.logger  = @logger unless @logger.nil?
 
-      if @wsapi_version.to_s.include?("v2.") && !@skip_sec_key
+      if @wsapi_version.to_s.include?("v2.") && !@skip_sec_key && auth_info[:api_key].nil?
         @rally_connection.setup_security_token(security_url)
       end
 

data/lib/rally_api/version.rb

@@ -4,5 +4,5 @@
 #of the applicable Subscription Agreement between your company and
 #Rally Software Development Corp.
 module RallyAPI
-  VERSION = "0.9.25"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rally_api
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 1.0.0
 platform: ruby
 authors:
 - Dave Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -28,70 +28,70 @@ dependencies:
   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: rspec
   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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: aruba
   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'
 description: API wrapper for Rally's JSON REST web services api
@@ -123,17 +123,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: rally_api
-rubygems_version: 2.1.9
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A wrapper for the Rally Web Services API using json