cloudfactory 0.1.14 → 0.1.15

data/cf.gemspec

@@ -81,4 +81,5 @@ EOF
   s.add_development_dependency "rake"
   s.add_development_dependency "webmock"
   s.add_development_dependency "timecop"
+  s.add_development_dependency "awesome_print"
 end

data/lib/cf/cli/line.rb

@@ -75,15 +75,24 @@ module Cf # :nodoc: all
           CF::Line.destroy(line_title, :forced => true)
           say("The line #{line_title} deleted forcefully!", :yellow)
         else
-          # say("!! Warning !!\nThe following are existing production runs based on this line.\n", :cyan)
-          # Cf::Production.new.list
-          say("!! Warning !!\nThere are existing production runs based on this line.\n", :yellow)
-          delete_forcefully = agree("Do you still want to delete this line? [y/n] ")
-          if delete_forcefully
-            CF::Line.destroy(line_title, :forced => true)
-            say("The line #{line_title} deleted successfully!", :yellow)
+          
+          # Check whether this line has existing runs or not
+          runs = CF::Run.all(line_title)
+          if runs.try(:error).blank?
+            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.list
+            delete_forcefully = agree("Do you still want to delete this line? [y/n] ")
+            if delete_forcefully
+              CF::Line.destroy(line_title, :forced => true)
+              say("The line #{line_title} deleted successfully!", :yellow)
+            else
+              say("Line deletion aborted!", :cyan)
+            end
           else
-            say("Line deletion aborted!", :cyan)
+            CF::Line.destroy(line_title)
+            say("The line #{line_title} deleted successfully!", :yellow)
           end
         end
       else
@@ -132,6 +141,7 @@ module Cf # :nodoc: all
         line_title = line_dump['title'].parameterize
         line_description = line_dump['description']
         line_department = line_dump['department']
+        line_public = line_dump['public']
         
         line = CF::Line.info(line_title)
         if line.error.blank? && options.force? 
@@ -146,7 +156,7 @@ module Cf # :nodoc: all
             say("Line creation aborted!!", :yellow) and exit(1)
           end
         end
-        line = CF::Line.new(line_title, line_department, :description => line_description)
+        line = CF::Line.new(line_title, line_department, {:description => line_description, :public => line_public})
         say "Creating new assembly line: #{line.title}", :green
         say("Error: #{line.errors}", :red) and exit(1) if line.errors.present?
         
@@ -173,12 +183,13 @@ module Cf # :nodoc: all
           type = station_file['station']['station_type']
           index = station_file['station']['station_index']
           input_formats_for_station = station_file['station']['input_formats']
+          batch_size = station_file['station']['batch_size']
           if type == "tournament"
             jury_worker = station_file['station']['jury_worker']
             auto_judge = station_file['station']['auto_judge']
-            station_params = {:line => line, :type => type, :jury_worker => jury_worker, :auto_judge => auto_judge, :input_formats => input_formats_for_station}
+            station_params = {:line => line, :type => type, :jury_worker => jury_worker, :auto_judge => auto_judge, :input_formats => input_formats_for_station, :batch_size => batch_size}
           else
-            station_params = {:line => line, :type => type, :input_formats => input_formats_for_station}
+            station_params = {:line => line, :type => type, :input_formats => input_formats_for_station, :batch_size => batch_size}
           end
           station = CF::Station.create(station_params) do |s|
             say "Adding Station #{index}: #{s.type}", :green

data/lib/cf/cli/line_yaml_validator.rb

@@ -1,6 +1,6 @@
 module Cf
   class LineYamlValidator
-    
+
     def self.validate(yaml_path)
       line_dump = YAML::load(File.read(yaml_path))
       errors = []
@@ -91,83 +91,85 @@ module Cf
                 end
               end
 
-              # 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']
+                # 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?
+                    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?
 
-                    instruction = custom_task_form['instruction']
+                    instruction = task_form['instruction']
                     errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
-                  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?
-
-                  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
@@ -175,9 +177,7 @@ module Cf
           end
         end
       end
-
       return errors
     end
-    
   end
 end

data/lib/cf/cli/production.rb

@@ -12,85 +12,116 @@ module Cf # :nodoc: all
     
     desc "production start <run-title>", "creates a production run with input data file at input/<run-title>.csv"
     method_option :input_data, :type => :string, :aliases => "-i", :desc => "the name of the input data file"
-    method_option :live, :type => :boolean, :default => false, :aliases => "-l", :desc => "force the host to set to live mturk environment"
-    def start(title=nil)
-      
+    method_option :live, :type => :boolean, :default => false, :desc => "specifies sandbox or live mode"
+    method_option :line, :type => :string, :aliases => "-l", :desc => "public line to use to do the production run. the format should be <account_name>/<line-title> e.g. millisami/brandiator"
+    def start(title=nil)      
       line_destination  = Dir.pwd
       yaml_source       = "#{line_destination}/line.yml"
+
+      set_target_uri(options[:live])
+      set_api_key
+      CF.account_name = CF::Account.info.name
       
-      unless File.exist?("#{yaml_source}")
-        say("The current directory is not a valid line directory.", :red) and return
+      if File.exist?("#{yaml_source}")
+        line_yaml_dump = YAML::load(File.open(yaml_source))
+        line_title = line_yaml_dump['title'].parameterize        
+        line = CF::Line.find(line_title)
+        line = Hashie::Mash.new(line)
+        if line.error.blank?
+          line_title = line_title
+        else
+          say("#{line.error.message}", :red) and return
+        end
+      elsif options[:line].present?
+        line = CF::Line.find(options[:line])
+        line = Hashie::Mash.new(line)
+        if line.error.blank?
+          line_title = options[:line]
+        else
+          say("#{line.error.message}", :red) and return
+        end
+      else
+        say("Looks like you're not in the Line directory or did not provide the line title to use the line", :red) and return
       end
 
-      line_yaml_dump = YAML::load(File.open(yaml_source))
-      line_title = line_yaml_dump['title'].parameterize
-
       if title.nil?
-        run_title       = "#{line_title}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
+        if line_title =~  /\w\/\w/
+          run_title       = "#{line_title.split("/").last}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
+        else
+          run_title       = "#{line_title}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
+        end
       else
         run_title       = "#{title.parameterize}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
       end
 
-      if !options[:input_data].nil?
-        input_data = "input/#{options[:input_data]}"
+      input_data = options[:input_data].presence
+      
+      if input_data =~ /^\// #checking absolute input data path
+        input_data_file = input_data
       else
-        input_data_dir = "#{line_destination}/input"
-        input_files = Dir["#{input_data_dir}/*.csv"]
-        file_count = input_files.size
-        case file_count
-        when 0
-          say("No input data file present inside the input folder", :red) and return
-        when 1
-          input_data = "input/#{extract_name(input_files.first)}"
-        else
-          # Let the user choose the file
-          chosen_file = nil
-          choose do |menu|
-            menu.header = "Input data files"
-            menu.prompt = "Please choose which file to be used as input data: "
+        if Dir.exist?("#{line_destination}/input")
+          input_data_dir = "#{line_destination}/input"
+          input_files = Dir["#{input_data_dir}/*.csv"]
+          file_count = input_files.size
+          case file_count
+          when 0
+            say("No input data file present inside the input folder", :red) and return
+          when 1
+            input_data_file = "#{Dir.pwd}/input/#{extract_name(input_files.first)}"
+          else
+            # Let the user choose the file
+            chosen_file = nil
+            choose do |menu|
+              menu.header = "Input data files"
+              menu.prompt = "Please choose which file to be used as input data: "
 
-            input_files.each do |item|
-              menu.choice(extract_name(item)) do
-                chosen_file = extract_name(item)
-                say("Using the file #{chosen_file} as input data")
+              input_files.each do |item|
+                menu.choice(extract_name(item)) do
+                  chosen_file = extract_name(item)
+                  say("Using the file #{chosen_file} as input data")
+                end
               end
             end
+            input_data_file = "#{Dir.pwd}/input/#{chosen_file}"
           end
-          input_data = "input/#{chosen_file}"
+        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
       end
       
-      unless File.exist?(input_data)
-        say("The input data file named #{input_data} is missing.", :red) and return
+      unless File.exist?(input_data_file)
+        say("The input data file named #{input_data} is missing", :red) and return
       end
       
-      set_target_uri(options[:live])
+
       # before starting the run creation process, we need to make sure whether the line exists or not
       # if not, then we got to first create the line and then do the production run
       # else we just simply do the production run
-      set_api_key(yaml_source)
-      CF.account_name = CF::Account.info.name
-      line = CF::Line.info(line_title)
-      input_data_file = "#{Dir.pwd}/#{input_data}"
+      
       if line.error.blank?
         say "Creating a production run with title #{run_title}", :green
-        run = CF::Run.create(line, run_title, input_data_file)
+        run = CF::Run.create(line_title, run_title, input_data_file)
         if run.errors.blank?
           display_success_run(run)
         else
           say("Error: #{run.errors}", :red)
         end
       else
-        # first create line
-        say("Creating the line: #{line_title}", :green)
-        Cf::Line.new.create
-        # Now create a production run with the title run_title
-        say "Creating a production run with title #{run_title}", :green
-        run = CF::Run.create(CF::Line.info(line_title), run_title, input_data_file)
-        if run.errors.blank?
-          display_success_run(run)
-        else
-          say("Error: #{run.errors}", :red)
+        if File.exist?("#{yaml_source}") and !line_title =~ /\w\/\w/
+          # first create line only if its in the valid line directory
+          say("Creating the line: #{line_title}", :green)
+          Cf::Line.new.create
+          # Now create a production run with the title run_title
+          say "Creating a production run with title #{run_title}", :green
+          run = CF::Run.create(CF::Line.info(line_title), run_title, input_data_file)
+          if run.errors.blank?
+            display_success_run(run)
+          else
+            say("Error: #{run.errors}", :red)
+          end
         end
       end
     end
@@ -109,7 +140,8 @@ module Cf # :nodoc: all
       set_api_key
       CF.account_name = CF::Account.info.name
       if options['line'].present?
-        runs = CF::Run.all(options['line'].parameterize)
+        line_title = options['line'].parameterize
+        runs = CF::Run.all(line_title)
       else
         runs = CF::Run.all
       end
@@ -128,7 +160,11 @@ module Cf # :nodoc: all
         end
       end
       say("\n")
-      say(runs_table)
+      if runs_table.rows.present?
+        say(runs_table)
+      else
+        say("No production run for line #{line_title}", :yellow)
+      end
     end
     
     desc "production resume", "resume a paused production run"

data/lib/cf/cli.rb

@@ -22,6 +22,10 @@ require "#{cli_directory}/line_yaml_validator"
 
 if ENV['TEST']
   require 'ruby-debug'
+  require 'awesome_print'
+  require 'active_support/time_with_zone'
+  ::Debugger.start
+  ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
 end
 
 module Cf # :nodoc: all
@@ -39,7 +43,7 @@ module Cf # :nodoc: all
       set_target_uri(false)
       resp = CF::Account.login(email, passwd)
       if resp.error.blank? and resp.api_key.present?
-        File.open(config_file, 'w') {|f| f.write({ :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp.api_key }.to_yaml) }
+        File.open(config_file, 'w') {|f| f.write("#Don't change this file unless you know what you're doing\n" + { :target_url => CF.api_url, :api_version => CF.api_version, :api_key => resp.api_key }.to_yaml) }
         say("\nNow you're logged in.\nTo get started, run cf help\n", :green)
       else
         say("\n#{resp.error.message}\nTry again with valid one.\n", :red)

data/lib/cf/client.rb

@@ -56,7 +56,7 @@ module CF # :nodoc: all
             Hashie::Mash.new(new_response)
           end
         else
-          response
+          JSON.load(response)
         end
       end
     end

data/lib/cf/line.rb

@@ -56,6 +56,7 @@ module CF
     def stations stations = nil
       if stations
         type = stations.type
+        @batch_size = stations.batch_size
         @station_input_formats = stations.station_input_formats
         if type == "Improve" && self.stations.size < 1
           raise ImproveStationNotAllowed.new("You cannot add Improve Station as a first station of a line")
@@ -63,30 +64,53 @@ module CF
           if type == "Tournament"
             @jury_worker = stations.jury_worker
             @auto_judge = stations.auto_judge
-            request_tournament = 
-            {
-              :body => 
+            if @batch_size.nil?
+              request_tournament = 
               {
-                :api_key => CF.api_key,
-                :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats}
+                :body => 
+                {
+                  :api_key => CF.api_key,
+                  :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats}
+                }
               }
-            }
+            else
+              request_tournament = 
+              {
+                :body => 
+                {
+                  :api_key => CF.api_key,
+                  :station => {:type => type, :jury_worker => @jury_worker, :auto_judge => @auto_judge, :input_formats => @station_input_formats, :batch_size => @batch_size}
+                }
+              }
+            end
             resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{self.title.downcase}/stations.json",request_tournament)
           else
-            request_general = 
-            {
-              :body => 
+            if @batch_size.nil?
+              request_general = 
+              {
+                :body => 
+                {
+                  :api_key => CF.api_key,
+                  :station => {:type => type, :input_formats => @station_input_formats}
+                }
+              }
+            else
+              request_general = 
               {
-                :api_key => CF.api_key,
-                :station => {:type => type, :input_formats => @station_input_formats}
+                :body => 
+                {
+                  :api_key => CF.api_key,
+                  :station => {:type => type, :input_formats => @station_input_formats, :batch_size => @batch_size}
+                }
               }
-            }
+            end
             resp = HTTParty.post("#{CF.api_url}#{CF.api_version}/lines/#{CF.account_name}/#{self.title.downcase}/stations.json",request_general)
           end
           station = CF::Station.new()
           resp.to_hash.each_pair do |k,v|
             station.send("#{k}=",v) if station.respond_to?(k)
           end
+          station.batch_size = @batch_size
           station.line = self
           station.line_title = self.title
           if resp.response.code != "200"
@@ -183,9 +207,16 @@ module CF
     def self.find(line)
       if line.class == CF::Line
         resp = get("/lines/#{CF.account_name}/#{line.title.downcase}.json")
-      else
-        resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
+      elsif line.class == String
+        if line.split("/").count == 2
+          account = line.split("/").first
+          title = line.split("/").last
+          resp = get("/lines/#{account}/#{title.downcase}.json")
+        elsif line.split("/").count == 1
+          resp = get("/lines/#{CF.account_name}/#{line.downcase}.json")
+        end
       end
+      return resp.to_hash
     end
     
     # ==Returns all the lines of an account
@@ -252,7 +283,7 @@ module CF
       end
     end
     
-    def self.details(line_title)
+    def self.inspect(line_title)
       resp = get("/lines/#{CF.account_name}/#{line_title.downcase}/inspect.json")
       send_resp = resp.to_hash
       @line_input_formats = []