iron_worker_ng 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/iron_worker_ng/api_client.rb

@@ -7,20 +7,26 @@ require_relative 'api_client_error'
 
 module IronWorkerNG
   class APIClient
-    attr_reader :token
-    attr_reader :project_id
+    AWS_US_EAST_HOST = 'worker-aws-us-east-1.iron.io'
+
+    attr_accessor :token
+    attr_accessor :project_id
+    attr_accessor :scheme
+    attr_accessor :host
+    attr_accessor :port
+    attr_accessor :api_version
+    attr_accessor :user_agent
 
     def initialize(token, project_id, params = {})
       @token = token
       @project_id = project_id
 
+      @scheme = params[:scheme] || 'https'
+      @host = params[:host] || IronWorkerNG::APIClient::AWS_US_EAST_HOST
+      @port = params[:port] || 443
+      @api_version = params[:api_version] || 2
       @user_agent = params[:user_agent] || 'iron_worker_ng-' + IronWorkerNG.version
 
-      scheme = params[:scheme] || 'https'
-      host = params[:host] || 'worker-aws-us-east-1.iron.io'
-      port = params[:port] || 443
-      api_version = params[:api_version] || 2
-
       @url = "#{scheme}://#{host}:#{port}/#{api_version}/"
 
       @rest = Rest::Client.new
@@ -58,8 +64,10 @@ module IronWorkerNG
       @rest.delete(@url + method, request_hash)
     end
 
+    # FIXME: retries support
+    # FIXME: user agent support
     def post_file(method, file, params = {})
-      request_hash = common_request_hash
+      request_hash = {}
       request_hash[:data] = params.to_json
       request_hash[:file] = file
 

data/lib/iron_worker_ng/feature/common/merge_dir.rb

@@ -23,13 +23,13 @@ module IronWorkerNG
 
           def bundle(zip)
             Dir.glob(@path + '/**/**') do |path|
-              zip.add(@dest + '/' + File.basename(@path) + path[@path.length .. -1], path)
+              zip.add(@dest + File.basename(@path) + path[@path.length .. -1], path)
             end
           end
         end
 
         module InstanceMethods
-          def merge_dir(path, dest = '.')
+          def merge_dir(path, dest = '')
             @features << IronWorkerNG::Feature::Common::MergeDir::Feature.new(path, dest)
           end
 

data/lib/iron_worker_ng/feature/common/merge_file.rb

@@ -16,12 +16,12 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            zip.add(@dest + '/' + File.basename(@path), @path)
+            zip.add(@dest + File.basename(@path), @path)
           end
         end
 
         module InstanceMethods
-          def merge_file(path, dest = '.')
+          def merge_file(path, dest = '')
             @features << IronWorkerNG::Feature::Common::MergeFile::Feature.new(path, dest)
           end
 

data/lib/iron_worker_ng/feature/ruby/merge_gem.rb

@@ -17,9 +17,9 @@ module IronWorkerNG
 
           def bundle(zip)
             if @spec.extensions.length == 0
-              zip.add('./gems/' + @spec.full_name, @spec.full_gem_path)
+              zip.add('gems/' + @spec.full_name, @spec.full_gem_path)
               Dir.glob(@spec.full_gem_path + '/**/**') do |path|
-                zip.add('./gems/' + @spec.full_name + path[@spec.full_gem_path.length .. -1], path)
+                zip.add('gems/' + @spec.full_name + path[@spec.full_gem_path.length .. -1], path)
               end
             end
           end

data/lib/iron_worker_ng/feature/ruby/merge_worker.rb

@@ -16,7 +16,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            zip.add('./' + File.basename(@path), @path)
+            zip.add(File.basename(@path), @path)
           end
 
           def code_for_init

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &79888470 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79888470
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &79887880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79887880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &79887110 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79887110
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &79886270 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79886270
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &79885800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -66,10 +86,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *79885800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &79995210 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +102,12 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *79995210
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: New generation ruby client for IronWorker
 email: info@iron.io
 executables:
@@ -123,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -799794559
+      hash: -316095647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: New generation ruby client for IronWorker