gi_cat_driver 0.2.2 → 0.2.3

data/README.md

@@ -43,6 +43,8 @@ Annotated source code documentation is available at http://nsidc.github.com/gi_c
 Rubydoc API documentation is available at http://rubydoc.info/gems/gi_cat_driver/
 
 ## Version History
+* 0.2.3
+  * Changed the harvest to be sequential. (one resource won't start harvest till the current one is completed or timeout)
 * 0.2.2
   * Added new methods to create and delete profiles
   * Fixed harvester request headers and now work properly

data/lib/gi_cat_driver/version.rb

@@ -1,3 +1,3 @@
 module GiCatDriver
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/gi_cat_driver.rb

@@ -125,8 +125,8 @@ module GiCatDriver
       harvestersinfo_array = get_harvest_resources(get_active_profile_id)
       harvestersinfo_array.each do |harvester_id, harvester_title|
         harvest_resource_for_active_configuration(harvester_id.to_s, harvester_title)
+        confirm_harvest_done(harvester_id, harvester_title, timeout)
       end
-      confirm_harvest_done(harvestersinfo_array, timeout)
     end
 
     #### Private Methods
@@ -194,8 +194,8 @@ module GiCatDriver
       while(1) do
         sleep 1    # Wait for one second
 
-#        rnum=rand   # Generate unique request to attempt to bypass cache
-        request = @base_url + "/services/conf/giconf/status?id=#{harvester_id}"
+        # appending unique number at the end of the request to bypass cache
+        request = @base_url + "/services/conf/giconf/status?id=#{harvester_id}&rand=#{generate_random_number}"
 
         response = Faraday.get do |req|
           req.url request
@@ -213,13 +213,11 @@ module GiCatDriver
     end
 
     # Run till harvest all the resources are completed or time out
-    def confirm_harvest_done(harvestersinfo_array, waitmax)
+    def confirm_harvest_done(harvester_id, harvester_title, waitmax)
       begin
         puts "Info: Max wait time (timeout) for current profile is set to #{waitmax} seconds"
         Timeout::timeout(waitmax.to_i) do
-          harvestersinfo_array.each do |harvester_id, harvester_title|
-            harvest_request_is_done(harvester_id.to_s, harvester_title)
-          end
+          harvest_request_is_done(harvester_id.to_s, harvester_title)
         end
       rescue Timeout::Error
         puts "Warning: re-harvest is time out(#{waitmax} seconds, we are going to reuse the previous harvest results"

data/spec/gi_cat_driver_spec.rb

@@ -264,7 +264,8 @@ describe GiCatDriver do
         })
         .to_return(:status => 200, :body => "", :headers => {})
 
-      harvest_status_url = "http://admin:pass@www.somecompany.com/services/conf/giconf/status?id=UUID-a5d11731-9a58-4818-8018-c085cea8b6e3"
+      @gi_cat.stub(:generate_random_number) {0.1111}
+      harvest_status_url = "http://admin:pass@www.somecompany.com/services/conf/giconf/status?id=UUID-a5d11731-9a58-4818-8018-c085cea8b6e3&rand=0.1111"
       stub_request(:get, harvest_status_url).
         with(:headers => {'Accept'=>'application/xml', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => '*/*', 'User-Agent' => 'Ruby'}).
         to_return(:status => 200, :body => File.new("spec/fixtures/status.xml"), :headers => [])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gi_cat_driver
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345151200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *70132345151200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345149560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,15 +33,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.6
+  version_requirements: *70132345149560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345148160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,15 +44,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70132345148160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345147140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,15 +55,10 @@ dependencies:
         version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.3
+  version_requirements: *70132345147140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345146380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -86,15 +66,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *70132345146380
 - !ruby/object:Gem::Dependency
   name: pygments.rb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345145620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,15 +77,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *70132345145620
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345144960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -118,15 +88,10 @@ dependencies:
         version: 0.99.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.99.4
+  version_requirements: *70132345144960
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345144500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,15 +99,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  version_requirements: *70132345144500
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345144040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -150,15 +110,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+  version_requirements: *70132345144040
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70132345143500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,12 +121,7 @@ dependencies:
         version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.11.0
+  version_requirements: *70132345143500
 description: Configure and control deployed instances of GI-Cat.
 email:
 - stuart.reed@nsidc.org
@@ -221,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Configure and control deployed instances of GI-Cat.