cloudfactory 0.1.21 → 0.1.22

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.22 (2011-08-26)
+
+* Fixed #317
+* Fixed #156
+* Fixed #328
+* Store the account name and email ad while cf login
+* For runs and lines listing, :page => 'all' added to return all the records #321
+* Inserting units to existing production run #310
+
 ## 0.1.21 (2011-08-25)
 
 * Line listing with pagination with custom flags

data/bin/cf

@@ -9,4 +9,10 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'cf/cli'
 
-Cf::CLI.start
+begin
+  Cf::CLI.start
+rescue ArgumentError
+  $stderr.puts "\n\tError during processing: #{$!.message}\n\n"
+rescue Psych::SyntaxError
+  $stderr.puts "\n\tError during processing: #{$!.message}\n\n"
+end

data/cf.gemspec

@@ -34,17 +34,20 @@ Gem::Specification.new do |s|
   
   3. Generate your first assembly line...
   > cf line generate <line-title>
-
-  4. Edit the generated line.yml to design your perfect assembly line
+  
+  4. Go into generated line directory
+  > cd <line-title>
+  
+  5. Edit the generated line.yml to design your perfect assembly line
   See http://developers.cloudfactory.com/lines/yaml.html
-
-  5. Create your line in CloudFactory
+  
+  6. Create your line in CloudFactory
   > cf line create
 
-  6. Do a test production run in the sandbox first...
+  7. Do a test production run in the sandbox first...
   > cf production start TITLE -i=INPUT_DATA.CSV
 
-  7. Go live! Send your production run to real workers...
+  8. Go live! Send your production run to real workers...
   > cf production start TITLE -i=INPUT_DATA.CSV --live
   
  ------------------------------------------------------------------------------

data/lib/cf/cli.rb

@@ -17,10 +17,11 @@ require 'active_support/core_ext/object/blank'
 
 cli_directory = File.expand_path("../cf/cli", File.dirname(__FILE__))
 require "#{cli_directory}/config"
+require "#{cli_directory}/line_yaml_validator"
 require "#{cli_directory}/line"
 require "#{cli_directory}/form"
 require "#{cli_directory}/production"
-require "#{cli_directory}/line_yaml_validator"
+
 
 if ENV['TEST']
   require 'ruby-debug'

data/lib/cf/cli/line.rb

@@ -27,6 +27,8 @@ end
 module Cf # :nodoc: all
   class Line < Thor # :nodoc: all
     include Cf::Config
+    include Cf::LineYamlValidator
+    
     desc "line generate LINE-TITLE", "generates a line template at <line-title>/line.yml"
     method_option :force, :type => :boolean, :default => false, :aliases => "-f", :desc => "force to overwrite the files if the line already exists, default is false"
     # method_option :with_custom_form, :type => :boolean, :default => false, :aliases => "-wcf", :desc => "generate the template with custom task form and the sample files, default is true"
@@ -68,9 +70,9 @@ module Cf # :nodoc: all
         CF.account_name = CF::Account.info.name
         line_title = options['line'].parameterize
       end
-      
-      line = CF::Line.find(line_title)
-      line = Hashie::Mash.new(line)
+
+      resp_line = CF::Line.find(line_title)
+      line = Hashie::Mash.new(resp_line)
       if line.title == line_title
         if options.force
           CF::Line.destroy(line_title, :forced => true)
@@ -78,12 +80,11 @@ module Cf # :nodoc: all
         else
           
           # Check whether this line has existing runs or not
-          runs = CF::Run.all(:line_title => line_title)
-          if runs.class == Array and runs.present?
+          resp_runs = CF::Run.all({:line_title => line_title})
+
+          if resp_runs.has_key?("runs") && resp_runs['runs'].present?
             say("!!! Warning !!!\nThe following are the existing production runs based on this line.", :cyan)
-            
-            existing_runs = Cf::Production.new
-            existing_runs.options = {"line" => line_title}
+            existing_runs = Cf::Production.new([],{'line' => line_title, 'all' => true})
             existing_runs.list
             
             delete_forcefully = agree("Do you still want to delete this line? [y/n] ")
@@ -126,8 +127,7 @@ module Cf # :nodoc: all
         say "The line.yml file does not exist in this directory", :red
         return
       end
-      
-      errors = LineYamlValidator.validate(yaml_source)
+      errors = validate(yaml_source)
       
       if errors.present?
         say("Invalid line.yml file. Correct its structure as per the errors shown below.", :red)
@@ -310,7 +310,7 @@ module Cf # :nodoc: all
       say("You don't have any lines to list", :yellow) and return if lines.blank?
       
       if resp_lines['total_pages']
-        say("Showing page #{current_page} of #{resp_lines['total_pages']} (Total lines: #{resp_lines['total_lines']})")
+        say("Showing page #{current_page} of #{resp_lines['total_pages']}\tTotal lines: #{resp_lines['total_lines']}")
       end
       lines.sort! { |a, b| a['title'] <=> b['title'] }
       lines_table = table do |t|

data/lib/cf/cli/line_yaml_validator.rb

@@ -1,181 +1,182 @@
 module Cf
-  class LineYamlValidator
+  module LineYamlValidator
 
-    def self.validate(yaml_path)
-      line_dump = YAML::load(File.read(yaml_path).strip)
-      errors = []
-      # Checking Department
-      if line_dump['department'].nil?
-        errors << "The line Department is missing!"
-      end
+    def validate(yaml_path)
+        line_dump = YAML::load(File.read(yaml_path).strip)
+        errors = []
+        # Checking Department
+        if line_dump['department'].nil?
+          errors << "The line Department is missing!"
+        end
 
-      # Checking Input Formats
-      input_formats = line_dump['input_formats']
-      if input_formats.nil?
-        errors << "The Input Format is missing!"
-      else
-        if input_formats.class == Array
-          input_formats.each_with_index do |input_format, index|
-            name = input_format['name']
-            required = input_format['required']
-            valid_type = input_format['valid_type']
-            if name.nil?
-              errors << "Input Format name is missing in Block #{index+1}!"
+        # Checking Input Formats
+        input_formats = line_dump['input_formats']
+        if input_formats.nil?
+          errors << "The Input Format is missing!"
+        else
+          if input_formats.class == Array
+            input_formats.each_with_index do |input_format, index|
+              name = input_format['name']
+              required = input_format['required']
+              valid_type = input_format['valid_type']
+              if name.nil?
+                errors << "Input Format name is missing in Block #{index+1}!"
+              end
             end
           end
         end
-      end
 
-      # Checking Stations
-      stations = line_dump['stations']
-      if stations.nil?
-        errors << "Station is missing!"
-      else
-        if stations.class == Array
-          if stations.first['station'].nil?
-            errors << "Station Settings missing!"
-          else
-            stations.each_with_index do |station, i|
-              station_index = station['station']['station_index']
-              errors << "Station Index is missing in Block station #{i+1}!" if station_index.nil?
+        # Checking Stations
+        stations = line_dump['stations']
+        if stations.nil?
+          errors << "Station is missing!"
+        else
+          if stations.class == Array
+            if stations.first['station'].nil?
+              errors << "Station Settings missing!"
+            else
+              stations.each_with_index do |station, i|
+                station_index = station['station']['station_index']
+                errors << "Station Index is missing in Block station #{i+1}!" if station_index.nil?
 
-              station_type = station['station']['station_type']
-              errors << "Station type is missing in Block station #{i+1}!" if station_type.nil?
+                station_type = station['station']['station_type']
+                errors << "Station type is missing in Block station #{i+1}!" if station_type.nil?
 
-              if station_type == "tournament"
-                jury_worker = station['station']['jury_worker']
-                if jury_worker.nil?
-                  errors << "Jury worker setting is missing in Block station #{i+1}!"
-                elsif !jury_worker.nil?
-                  reward = jury_worker['reward']
-                  errors << "Reward for Jury worker is missing in block of Tournament Station #{i+1}!" if reward.nil?
-                  errors << "Reward Must be greater than 0 in Block station #{i+1}!" if !reward.nil? && reward < 1
-                end
-              end
-              # Checking Worker
-              worker = station['station']['worker']
-              if worker.class != Hash
-                errors << "Worker is missing in Block station #{i+1}!" 
-              elsif worker.class == Hash
-                # Checking Worker type
-                worker.each_pair do |k, v|
-                  errors << "Should not be an array" if v.class == Array && k != "skill_badges"
+                if station_type == "tournament"
+                  jury_worker = station['station']['jury_worker']
+                  if jury_worker.nil?
+                    errors << "Jury worker setting is missing in Block station #{i+1}!"
+                  elsif !jury_worker.nil?
+                    reward = jury_worker['reward']
+                    errors << "Reward for Jury worker is missing in block of Tournament Station #{i+1}!" if reward.nil?
+                    errors << "Reward Must be greater than 0 in Block station #{i+1}!" if !reward.nil? && reward < 1
+                  end
                 end
-                worker_type = worker['worker_type']
-                if worker_type.nil?
-                  errors << "Worker Type is missing!"
-                else
-                  if worker_type != "human" 
-                    errors << "Worker type is invalid in Block station #{i+1}!" if worker_type.split("_").last != "robot"
-                    if worker_type.split("_").last == "robot"
-                      settings = worker['settings']
-                      errors << "Settings for the robot worker is missingin Block station #{i+1}!" if settings.nil?
-                    end
-                  elsif worker_type == "human" 
-                    # Checking number of workers if worker_type == "human"
-                    num_workers = worker['num_workers']
-                    if num_workers.nil?
-                      errors << "Number of workers not specified in Block station #{i+1}!"
-                    else
-                      errors << "Number of workers must be greater than 0 in Block station #{i+1}!" if num_workers < 1
-                    end
+                # Checking Worker
+                worker = station['station']['worker']
+                if worker.class != Hash
+                  errors << "Worker is missing in Block station #{i+1}!" 
+                elsif worker.class == Hash
+                  # Checking Worker type
+                  worker.each_pair do |k, v|
+                    errors << "Should not be an array" if v.class == Array && k != "skill_badges"
+                  end
+                  worker_type = worker['worker_type']
+                  if worker_type.nil?
+                    errors << "Worker Type is missing!"
+                  else
+                    if worker_type != "human" 
+                      errors << "Worker type is invalid in Block station #{i+1}!" if worker_type.split("_").last != "robot"
+                      if worker_type.split("_").last == "robot"
+                        settings = worker['settings']
+                        errors << "Settings for the robot worker is missingin Block station #{i+1}!" if settings.nil?
+                      end
+                    elsif worker_type == "human" 
+                      # Checking number of workers if worker_type == "human"
+                      num_workers = worker['num_workers']
+                      if num_workers.nil?
+                        errors << "Number of workers not specified in Block station #{i+1}!"
+                      else
+                        errors << "Number of workers must be greater than 0 in Block station #{i+1}!" if num_workers < 1
+                      end
 
-                    # Checking reward of workers if worker_type == "human"
-                    reward = worker['reward']
-                    if reward.nil?
-                      errors << "Reward of workers not specified in Block station #{i+1}!" 
-                    else
-                      errors << "Reward of workers must be greater than 0 in Block station #{i+1}!" if reward < 1
+                      # Checking reward of workers if worker_type == "human"
+                      reward = worker['reward']
+                      if reward.nil?
+                        errors << "Reward of workers not specified in Block station #{i+1}!" 
+                      else
+                        errors << "Reward of workers must be greater than 0 in Block station #{i+1}!" if reward < 1
+                      end
                     end
                   end
                 end
-              end
 
-              if station_type != "improve"
-                # Checking Stat_badge
-                stat_badge = station['station']['worker']['stat_badge']
-                if !stat_badge.nil?
-                  errors << "Stat badge setting is invalid in Block station #{i+1}!" if stat_badge.class != Hash
-                end
+                if station_type != "improve"
+                  # Checking Stat_badge
+                  stat_badge = station['station']['worker']['stat_badge']
+                  if !stat_badge.nil?
+                    errors << "Stat badge setting is invalid in Block station #{i+1}!" if stat_badge.class != Hash
+                  end
 
-                # Checking skill_badge
-                skill_badges = station['station']['worker']['skill_badges']
-                if !skill_badges.nil?
-                  errors << "Skill badge settings is invalid in Block station #{i+1}!" if skill_badges.class != Array
-                  skill_badges.each_with_index do |badge, badge_index|
-                    badge_title = badge['title']
-                    badge_description = badge['description']
-                    max_badges = badge['max_badges']
-                    badge_test = badge['test']
-                    test_input = badge_test['input'] if badge_test.class == Hash
-                    expected_output = badge_test['expected_output'] if badge_test.class == Hash
-                    errors << "Skill badge title is Missing in Block #{badge_index+1}!" if badge_title.nil?
-                    errors << "Skill badge Description is Missing in Block #{badge_index+1}!" if badge_description.nil?
-                    errors << "Skill badge max_badges must be greater than 1000 in Block #{badge_index+1}!" if max_badges < 1000 && !max_badges.nil?
-                    errors << "Skill badge Test is Missing in Block #{badge_index+1}!" if badge_test.nil?
-                    errors << "Skill badge Test is Invalid (must be Hash) in Block #{badge_index+1}!" if badge_test.class != Hash && !badge_test.nil?
-                    errors << "Skill badge Test input is Missing in Block #{badge_index+1}!" if test_input.nil? && !badge_test.nil?
-                    errors << "Skill badge Test input is Invalid (must be Hash) in Block #{badge_index+1}!" if  test_input.class != Hash && !test_input.nil? && !badge_test.nil?
-                    errors << "Skill badge Test expected_output is Missing in Block #{badge_index+1}!" if expected_output.nil? && !badge_test.nil?
-                    errors << "Skill badge Test expected_output is Invalid (must be an array) in Block #{badge_index+1}!" if expected_output.class != Array && !expected_output.nil? && !badge_test.nil?
+                  # Checking skill_badge
+                  skill_badges = station['station']['worker']['skill_badges']
+                  if !skill_badges.nil?
+                    errors << "Skill badge settings is invalid in Block station #{i+1}!" if skill_badges.class != Array
+                    skill_badges.each_with_index do |badge, badge_index|
+                      badge_title = badge['title']
+                      badge_description = badge['description']
+                      max_badges = badge['max_badges']
+                      badge_test = badge['test']
+                      test_input = badge_test['input'] if badge_test.class == Hash
+                      expected_output = badge_test['expected_output'] if badge_test.class == Hash
+                      errors << "Skill badge title is Missing in Block #{badge_index+1}!" if badge_title.nil?
+                      errors << "Skill badge Description is Missing in Block #{badge_index+1}!" if badge_description.nil?
+                      errors << "Skill badge max_badges must be greater than 1000 in Block #{badge_index+1}!" if max_badges < 1000 && !max_badges.nil?
+                      errors << "Skill badge Test is Missing in Block #{badge_index+1}!" if badge_test.nil?
+                      errors << "Skill badge Test is Invalid (must be Hash) in Block #{badge_index+1}!" if badge_test.class != Hash && !badge_test.nil?
+                      errors << "Skill badge Test input is Missing in Block #{badge_index+1}!" if test_input.nil? && !badge_test.nil?
+                      errors << "Skill badge Test input is Invalid (must be Hash) in Block #{badge_index+1}!" if  test_input.class != Hash && !test_input.nil? && !badge_test.nil?
+                      errors << "Skill badge Test expected_output is Missing in Block #{badge_index+1}!" if expected_output.nil? && !badge_test.nil?
+                      errors << "Skill badge Test expected_output is Invalid (must be an array) in Block #{badge_index+1}!" if expected_output.class != Array && !expected_output.nil? && !badge_test.nil?
+                    end
                   end
-                end
 
-                # Checking TaskForm
-                if worker_type == "human"
-                  task_form = station['station']['task_form']
-                  if task_form.nil?
-                    custom_task_form = station['station']['custom_task_form']
-                    if custom_task_form.nil?
-                      errors << "Form is missing in Block station #{i+1}!"
-                    elsif custom_task_form.class == Hash
-                      form_title = custom_task_form['form_title']
-                      errors << "Form Title is missing in Block station #{i+1}!" if form_title.nil?
+                  # Checking TaskForm
+                  if worker_type == "human"
+                    task_form = station['station']['task_form']
+                    if task_form.nil?
+                      custom_task_form = station['station']['custom_task_form']
+                      if custom_task_form.nil?
+                        errors << "Form is missing in Block station #{i+1}!"
+                      elsif custom_task_form.class == Hash
+                        form_title = custom_task_form['form_title']
+                        errors << "Form Title is missing in Block station #{i+1}!" if form_title.nil?
 
-                      instruction = custom_task_form['instruction']
-                      errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
+                        instruction = custom_task_form['instruction']
+                        errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
                       
-                      errors << "station_#{i+1} folder is missing! Create station_#{i+1} folder in #{Dir.pwd}" if !File.exist?("#{Dir.pwd}/station_#{i+1}")
+                        errors << "station_#{i+1} folder is missing! Create station_#{i+1} folder in #{Dir.pwd}" if !File.exist?("#{Dir.pwd}/station_#{i+1}")
                       
-                      if File.exist?("#{Dir.pwd}/station_#{i+1}")
-                        station_source = "#{Dir.pwd}/station_#{i+1}"
-                        errors << "form.html is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("#{station_source}/form.html")
+                        if File.exist?("#{Dir.pwd}/station_#{i+1}")
+                          station_source = "#{Dir.pwd}/station_#{i+1}"
+                          errors << "form.html is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("#{station_source}/form.html")
+                        end
                       end
-                    end
-                  elsif task_form.class == Hash
-                    form_title = task_form['form_title']
-                    errors << "Form Title is missing in Block station #{i+1}!" if form_title.nil?
+                    elsif task_form.class == Hash
+                      form_title = task_form['form_title']
+                      errors << "Form Title is missing in Block station #{i+1}!" if form_title.nil?
 
-                    instruction = task_form['instruction']
-                    errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
+                      instruction = task_form['instruction']
+                      errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
 
-                    # Checking Form Fields
-                    form_fields = task_form['form_fields']
-                    errors << "Form Field is missing in Block station #{i+1}!" if form_fields.nil?
-                    if form_fields.class == Array
-                      form_fields.each_with_index do |form_field, index|
-                        field_label = form_field['label']
-                        errors << "Label is missing in block #{index+1} of Form Field within Station #{i+1}!" if field_label.nil?
-                        required = form_field['required']
-                        field_type = form_field['field_type']
-                        if !field_type.nil?
-                          unless %w(short_answer long_answer radio_button check_box select_box date email number).include?(field_type)
-                            errors << "Field Type of Form Field is invalid in Block #{index+1} of station Block #{i+1}!"
-                          end
-                          if field_type == "radio_button" || field_type == "select_box"
-                            option_values = form_field['option_values']
-                            if option_values.nil?
-                              errors << "Option values is required for field_type => #{field_type} in block #{index+1} of Form Field within Station #{i+1} !"
-                            elsif !option_values.nil?
-                              if option_values.class != Array
-                                errors << "Option values must be an array for field_type => #{field_type} in block #{index+1} of Form Field within Station #{i+1}!"  
+                      # Checking Form Fields
+                      form_fields = task_form['form_fields']
+                      errors << "Form Field is missing in Block station #{i+1}!" if form_fields.nil?
+                      if form_fields.class == Array
+                        form_fields.each_with_index do |form_field, index|
+                          field_label = form_field['label']
+                          errors << "Label is missing in block #{index+1} of Form Field within Station #{i+1}!" if field_label.nil?
+                          required = form_field['required']
+                          field_type = form_field['field_type']
+                          if !field_type.nil?
+                            unless %w(short_answer long_answer radio_button check_box select_box date email number).include?(field_type)
+                              errors << "Field Type of Form Field is invalid in Block #{index+1} of station Block #{i+1}!"
+                            end
+                            if field_type == "radio_button" || field_type == "select_box"
+                              option_values = form_field['option_values']
+                              if option_values.nil?
+                                errors << "Option values is required for field_type => #{field_type} in block #{index+1} of Form Field within Station #{i+1} !"
+                              elsif !option_values.nil?
+                                if option_values.class != Array
+                                  errors << "Option values must be an array for field_type => #{field_type} in block #{index+1} of Form Field within Station #{i+1}!"  
+                                end
                               end
                             end
                           end
                         end
+                      else
+                        errors << "Form fields must be an array for Station #{i+1}!"
                       end
-                    else
-                      errors << "Form fields must be an array for Station #{i+1}!"
                     end
                   end
                 end
@@ -183,8 +184,7 @@ module Cf
             end
           end
         end
-      end
-      return errors
+        return errors
     end
   end
 end

data/lib/cf/cli/production.rb

@@ -134,26 +134,57 @@ module Cf # :nodoc: all
     end
     
     desc "production list", "list the production runs"
-    method_option :line, :type => :string, :aliases => "-l", :desc => "the title of the line"
+    method_option :line, :type => :string, :aliases => "-l", :desc => "the title of the line, if the line title is not given, it will show all the production runs under your account"
     method_option :page, :type => :numeric, :aliases => "-p", :desc => "page number"
+    method_option :all, :type => :boolean, :default => false, :aliases => '-a', :desc => "list all the production runs"
     def list
       set_target_uri(false)
       set_api_key
       CF.account_name = CF::Account.info.name
+      param = {}
+      current_page = 1
+
       if options['line'].present?
         line_title = options['line'].parameterize
-        runs = CF::Run.all(:line_title => line_title)
+        param.merge!({:line_title => line_title})
+
+        if options['all']
+          param.merge!({:page => "all"})
+          current_page = 1
+        end
+        
+        if page = options['page'].presence
+          param.merge!({:page => page})
+          current_page = page
+        end
+
       else
-        runs = CF::Run.all
-      end
+        if options['all']
+          param = {:page => "all"}
+          current_page = 1
+        end
 
-      unless runs.kind_of?(Array)
-        if runs.error.present?
-          say("No Runs\n#{runs.error.message}", :red) and exit(1)
+        if page = options['page'].presence
+          param.merge!({:page => page})
+          current_page = page
         end
       end
 
-      runs.sort! {|a, b| a[:name] <=> b[:name] }
+      resp_runs = CF::Run.all(param)
+      
+      if resp_runs.has_key?('error')
+        say("#{resp_runs['error']}", :red) and exit(1)
+      end
+      
+      if resp_runs.has_key?("runs") && resp_runs['runs'].blank?
+        say("\nRun list is empty.\n", :yellow) and return
+      end
+      
+      if resp_runs['total_pages']
+        say("\nShowing page #{current_page} of #{resp_runs['total_pages']} (Total runs: #{resp_runs['total_runs']})")
+      end
+      runs = resp_runs['runs'].presence
+      runs.sort! {|a, b| a['title'] <=> b['title'] }
       runs_table = table do |t|
         t.headings = ["Run Title", 'URL']
         runs.each do |run|
@@ -184,6 +215,35 @@ module Cf # :nodoc: all
       # if result.status == "resumed"
       say("Run with title \"#{result.title}\" is resumed!", :green)
       # end
-    end    
+    end   
+    
+    desc "production add_units", "add units to already existing production run"
+    method_option :run_title, :type => :string, :required => true, :aliases => "-t", :desc => "the title of the run to resume"
+    method_option :input_data, :type => :string, :required => true, :aliases => "-i", :desc => "the path of the input data file"
+    
+    def add_units
+      set_target_uri(false)
+      set_api_key
+      CF.account_name = CF::Account.info.name
+      run_title = options[:run_title].parameterize
+      input_data = options[:input_data].presence
+      
+      if input_data =~ /^\// #checking absolute input data path
+        input_data_file = input_data
+      else
+        unless File.exist?(input_data)
+          say("The input data file named #{input_data} doesn't exist", :red) and return
+        end
+        input_data_file = "#{Dir.pwd}/#{input_data}"
+      end
+      units = CF::Run.add_units({:run_title => run_title, :file => input_data_file})
+      if units['error'].present?
+        say("Error: #{units['error']['message']}", :red) and exit(1)
+      end
+
+      # if result.status == "resumed"
+      say("\"#{units['successfull']}\"!", :green)
+      # end
+    end 
   end
 end

data/lib/cf/run.rb

@@ -89,18 +89,27 @@ module CF
     def self.add_units(options={})
       units = options[:units].presence
       run_title = options[:run_title].presence
-
-      request = 
-      {
-        :body => 
+      file = options[:file].presence
+      if units
+        request = 
         {
-          :api_key => CF.api_key,
-          :data => units
+          :body => 
+          {
+            :api_key => CF.api_key,
+            :data => units
+          }
         }
-      }
-      resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/runs/#{CF.account_name}/#{run_title.downcase}/units.json",request)
-      @errors = resp['error']['message'] if resp.code != 200
-      return resp.parsed_response
+        resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/runs/#{CF.account_name}/#{run_title.downcase}/units.json",request)
+        @errors = resp['error']['message'] if resp.code != 200
+        return resp.parsed_response
+      elsif file
+        if File.exist?(file.to_s)
+          file_upload = File.new(file, 'rb')
+          resp = post("/runs/#{CF.account_name}/#{run_title.downcase}/units.json", {:file => file_upload})
+          @errors = resp.error.message if resp.code != 200
+          return resp.to_hash
+        end
+      end
     end
     # ==Returns Final Output of production Run
     # ===Usage Example:
@@ -216,7 +225,12 @@ module CF
           resp = get("/lines/#{CF.account_name}/#{line_title}/list_runs.json", :page => page)
         end
       end
-      @errors = resp.error.message if resp.code != 200
+      
+      if resp.code != 200
+        send_resp = {"error" => resp.error.message}
+        return send_resp
+      end
+
       new_resp = []
       if resp.code == 200
         if resp.runs
@@ -226,7 +240,7 @@ module CF
             end
           end
         end
-        send_resp = {"runs" => new_resp, "total_pages" => resp.total_pages}
+        send_resp = {"runs" => new_resp, "total_pages" => resp.total_pages, "total_runs" => resp.total_runs}
         return send_resp
       end
     end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF # :nodoc: all
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

data/spec/run_spec.rb

@@ -379,7 +379,8 @@ module CF
           
           got_run = CF::Run.all
           got_run['runs'].class.should eql(Array)
-          got_run['total_pages'].should eql(2)
+          got_run['runs'].first['progress'].should eql(100)
+          got_run['runs'].first['status'].should eql("active")
         end
       end
       
@@ -407,6 +408,8 @@ module CF
         # WebMock.allow_net_connect!
           run = CF::Run.all({:page => 1})
           run['runs'].class.should eql(Array)
+          run['runs'].first['progress'].should eql(100)
+          run['runs'].first['status'].should eql("active")
         end
       end
       
@@ -481,6 +484,28 @@ module CF
         end
       end
       
+      it "should add units by passing file" do
+        VCR.use_cassette "run/block/adding_units_file", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+          line = CF::Line.create("adding_units_file","Digitization") do |l|
+            CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+            CF::InputFormat.new({:line => l, :name => "Website", :required => true, :valid_type => "url"})
+            CF::Station.create({:line => l, :type => "work"}) do |s|
+              CF::HumanWorker.new({:station => s, :number => 1, :reward => 20})
+              CF::TaskForm.create({:station => s, :title => "Enter text from a business card image", :instruction => "Describe"}) do |i|
+                CF::FormField.new({:form => i, :label => "First Name", :field_type => "short_answer", :required => "true"})
+                CF::FormField.new({:form => i, :label => "Middle Name", :field_type => "short_answer"})
+                CF::FormField.new({:form => i, :label => "Last Name", :field_type => "short_answer", :required => "true"})
+              end
+            end
+          end
+          run = CF::Run.create(line, "adding_units_file_run", [{"Company"=>"Sprout","Website"=>"sprout.com"}])
+          added_units = CF::Run.add_units({:run_title => "adding_units_file_run", :file => File.expand_path("../../fixtures/input_data/test.csv", __FILE__)})
+          added_units['successfull'].should eql("sucessfully added 1 units, failed :0")
+          run.title.should eql("adding_units_file_run")
+        end
+      end
+      
       it "should throw errors for invalid input while adding units" do
         VCR.use_cassette "run/block/adding_units_errors", :record => :new_episodes do
         # WebMock.allow_net_connect!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154423560 !ruby/object:Gem::Requirement
+  requirement: &2161047200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154423560
+  version_requirements: *2161047200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154423060 !ruby/object:Gem::Requirement
+  requirement: &2161046700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154423060
+  version_requirements: *2161046700
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2154422560 !ruby/object:Gem::Requirement
+  requirement: &2161046200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154422560
+  version_requirements: *2161046200
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157390480 !ruby/object:Gem::Requirement
+  requirement: &2161045820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157390480
+  version_requirements: *2161045820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157390020 !ruby/object:Gem::Requirement
+  requirement: &2161045360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157390020
+  version_requirements: *2161045360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2157389520 !ruby/object:Gem::Requirement
+  requirement: &2161044860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2157389520
+  version_requirements: *2161044860
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157389100 !ruby/object:Gem::Requirement
+  requirement: &2161044440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157389100
+  version_requirements: *2161044440
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2157388560 !ruby/object:Gem::Requirement
+  requirement: &2161043900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157388560
+  version_requirements: *2161043900
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2157388060 !ruby/object:Gem::Requirement
+  requirement: &2161043400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2157388060
+  version_requirements: *2161043400
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2157387680 !ruby/object:Gem::Requirement
+  requirement: &2161043020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157387680
+  version_requirements: *2161043020
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2157387220 !ruby/object:Gem::Requirement
+  requirement: &2161060720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157387220
+  version_requirements: *2161060720
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2157386800 !ruby/object:Gem::Requirement
+  requirement: &2161060300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157386800
+  version_requirements: *2161060300
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2157386380 !ruby/object:Gem::Requirement
+  requirement: &2161059880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157386380
+  version_requirements: *2161059880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157385880 !ruby/object:Gem::Requirement
+  requirement: &2161059380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2157385880
+  version_requirements: *2161059380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157385380 !ruby/object:Gem::Requirement
+  requirement: &2161058880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157385380
+  version_requirements: *2161058880
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2157384920 !ruby/object:Gem::Requirement
+  requirement: &2161058420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157384920
+  version_requirements: *2161058420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2157384540 !ruby/object:Gem::Requirement
+  requirement: &2161058040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157384540
+  version_requirements: *2161058040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157384080 !ruby/object:Gem::Requirement
+  requirement: &2161057580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157384080
+  version_requirements: *2161057580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157383580 !ruby/object:Gem::Requirement
+  requirement: &2161057080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2157383580
+  version_requirements: *2161057080
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2157383160 !ruby/object:Gem::Requirement
+  requirement: &2161056660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157383160
+  version_requirements: *2161056660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157382700 !ruby/object:Gem::Requirement
+  requirement: &2161056200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157382700
+  version_requirements: *2161056200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157398660 !ruby/object:Gem::Requirement
+  requirement: &2161055780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157398660
+  version_requirements: *2161055780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2157398240 !ruby/object:Gem::Requirement
+  requirement: &2161055360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157398240
+  version_requirements: *2161055360
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com
@@ -369,12 +369,12 @@ post_install_message: ! " ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁
   your API key\n  http://cloudfactory.com/users/sign_up\n  Get API key from welcome
   email or http://cloudfactory.com/account#settings\n\n  2. Login with your credentials\n
   \ > cf login\n  \n  3. Generate your first assembly line...\n  > cf line generate
-  <line-title>\n\n  4. Edit the generated line.yml to design your perfect assembly
-  line\n  See http://developers.cloudfactory.com/lines/yaml.html\n\n  5. Create your
-  line in CloudFactory\n  > cf line create\n\n  6. Do a test production run in the
-  sandbox first...\n  > cf production start TITLE -i=INPUT_DATA.CSV\n\n  7. Go live!
-  Send your production run to real workers...\n  > cf production start TITLE -i=INPUT_DATA.CSV
-  --live\n  \n ------------------------------------------------------------------------------\n
+  <line-title>\n  \n  4. Go into generated line directory\n  > cd <line-title>\n  \n
+  \ 5. Edit the generated line.yml to design your perfect assembly line\n  See http://developers.cloudfactory.com/lines/yaml.html\n
+  \ \n  6. Create your line in CloudFactory\n  > cf line create\n\n  7. Do a test
+  production run in the sandbox first...\n  > cf production start TITLE -i=INPUT_DATA.CSV\n\n
+  \ 8. Go live! Send your production run to real workers...\n  > cf production start
+  TITLE -i=INPUT_DATA.CSV --live\n  \n ------------------------------------------------------------------------------\n
   \n  Follow @thecloudfactory on Twitter for announcements, updates, and news.\n  https://twitter.com/thecloudfactory\n\n
   \ Add your project or organization to the apps wiki!\n  https://github.com/sprout/cloudfactory_ruby/wiki/Apps\n
   \ \n ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁