cloudfactory 0.1.9 → 0.1.10

data/features/support/cli_steps.rb

@@ -13,4 +13,48 @@ end
 
 Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
   check_file_content(file, partial_content, true)
+end
+
+When /^I run `([^`]*)` for cf$/ do |cmd|
+  Timecop.freeze(Time.now) do
+    run_simple(unescape(cmd), false)
+  end
+end
+
+Given /^a line exists with title "([^"]*)"$/ do |title|
+  dir = title
+  steps %Q{
+      Given a file named "#{dir}/line.yml" with:
+      """
+      title: #{title}
+      department: Web Research
+      input_formats:
+        - name: email
+          required: true
+          valid_type: email
+      stations:
+        - station:
+            station_index: 1
+            station_type: work
+            worker:
+              worker_type: human
+              num_workers: 1
+              reward: 5
+            task_form:
+              form_title: Enter the email address
+              instruction: Do research to get the email address
+              form_fields:
+                - label: CEO Email
+                  field_type: email
+                  required: true            
+      """
+      And I cd to "#{dir}"
+      When I run `cf line create`
+      Then the output should match:
+        """
+        Line was successfully created.
+        """
+      And I cd to "../"
+    }
+  
 end

data/features/support/env.rb

@@ -4,8 +4,8 @@ require 'cf'
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 Before('@slow_process') do
-  @aruba_io_wait_seconds = 4
-  @aruba_timeout_seconds = 4
+  @aruba_io_wait_seconds = 5
+  @aruba_timeout_seconds = 5
 end
 
 Before('@moderate_slow_process') do

data/lib/cf.rb

@@ -4,13 +4,12 @@ rescue LoadError
   # do nothing
 end
 require 'yaml'
-require 'rails'
 require 'hashie'
 require 'active_support/concern'
-#require 'active_support/rescuable'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
+require 'active_support/hash_with_indifferent_access'
 require "rest_client"
 require 'json'
 require 'terminal-table/import'
@@ -20,9 +19,9 @@ directory = File.expand_path(File.dirname(__FILE__))
 Hash.send :include, Hashie::HashExtensions
 
 
-module CF  
+module CF  # :nodoc: all
 
-  class << self
+  class << self # :nodoc: all
     attr_accessor :api_key, :account_name, :api_version, :api_url
     def configure
       yield self

data/lib/cf/account.rb

@@ -1,10 +1,15 @@
-module CF
+module CF 
   class Account
     include Client
 
     class << self
+      
+      # Contains Error message if any
       attr_accessor :errors
 
+      # ==Returns Account Info
+      # ===Usage Example:
+      #   CF::Account.info
       def info
         resp = get('/account.json')
 
@@ -14,11 +19,17 @@ module CF
         return resp
       end
 
+      # ==Validation of account
+      # ===Usage Example:
+      #   CF::Account.valid?
       def valid?
         info
         errors.nil?
       end
       
+      # ==Login to CloudFactory app through cloudfactory GEM
+      # ===Usage Example:
+      #   CF::Account.login("sprout@sprout-technology.com", "password")
       def login(email, passwd)
         resp = post('/account_login.json', :user => {:email => email, :password => passwd})
         resp

data/lib/cf/cli.rb

@@ -23,8 +23,8 @@ if ENV['TEST']
   require 'ruby-debug'
 end
 
-module Cf
-  class CLI < Thor
+module Cf # :nodoc: all
+  class CLI < Thor # :nodoc: all
     include Thor::Actions
     include Cf::Config
     

data/lib/cf/cli/config.rb

@@ -1,5 +1,5 @@
-module Cf
-  module Config
+module Cf # :nodoc: all
+  module Config # :nodoc: all
     def config_file
       File.join(find_home, '.cf_credentials')
     end

data/lib/cf/cli/form.rb

@@ -1,7 +1,7 @@
 require 'thor/group'
 
-module Cf
-  class Newform < Thor::Group
+module Cf # :nodoc: all
+  class Newform < Thor::Group # :nodoc: all
     include Thor::Actions
     include Cf::Config
     source_root File.expand_path('../templates', __FILE__)
@@ -17,7 +17,7 @@ module Cf
     end
   end
 
-  class FormPreview < Thor::Group
+  class FormPreview < Thor::Group # :nodoc: all
     include Thor::Actions
     include Cf::Config
     source_root File.expand_path('../templates', __FILE__)
@@ -37,8 +37,8 @@ module Cf
 end
 
 module Cf
-  class Form < Thor
-    include Cf::Config
+  class Form < Thor # :nodoc: all
+    include Cf::Config 
 
     desc "form generate", "generates a custom task form at <line-title>/<form-title>.html and its associated css and js files"
     method_option :station, :type => :numeric, :required => true, :aliases => "-st", :desc => "the station index this form should be associated with"

data/lib/cf/cli/line.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 require 'thor/group'
 
-module Cf
-  class Newline < Thor::Group
+module Cf # :nodoc: all
+  class Newline < Thor::Group # :nodoc: all
     include Thor::Actions
     include Cf::Config
     source_root File.expand_path('../templates/', __FILE__)
@@ -24,8 +24,8 @@ module Cf
 end
 
 
-module Cf
-  class Line < Thor
+module Cf # :nodoc: all
+  class Line < Thor # :nodoc: all
     include Cf::Config
     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"
@@ -68,6 +68,19 @@ module Cf
       say("The line #{line_title} was deleted successfully!", :yellow)
     end
 
+    no_tasks {
+      # method to call with line title to delete the line if validation fails during the creation of line
+      def rollback(line_title)
+        CF::Line.destroy(line_title)
+      end
+      
+      def display_error(line_title, error_message)
+        say("Error: #{error_message}", :red)
+        rollback(line_title)
+        exit(1)
+      end
+    }
+    
     desc "line create", "takes the yaml file at line.yml and creates a new line at http://cloudfactory.com"
     def create
       line_source = Dir.pwd
@@ -89,24 +102,24 @@ module Cf
         line_department = line_dump['department']
         line = CF::Line.new(line_title, line_department, :description => line_description)
 
-        unless line.errors.blank?
-          say("#{line.errors.message}", :red) and return
-        end
-
         say "Creating new assembly line: #{line.title}", :green
+        display_error(line_title, "#{line.errors}") if line.errors.present?
+        
         say "Adding InputFormats", :green
 
         # Creation of InputFormat from yaml file
         input_formats = line_dump['input_formats']
-        input_formats.each do |input_format|
+        input_formats.each_with_index do |input_format, index|
+          
           attrs = {
             :name => input_format['name'],
             :required => input_format['required'],
             :valid_type => input_format['valid_type']
           }
           input_format_for_line = CF::InputFormat.new(attrs)
-          line.input_formats input_format_for_line
+          input_format = line.input_formats input_format_for_line
           say_status "input", "#{attrs[:name]}"
+          display_error(line_title, "#{line.input_formats[index].errors}") if line.input_formats[index].errors.present?
         end
 
         # Creation of Station
@@ -123,8 +136,9 @@ module Cf
             station_params = {:line => line, :type => type, :input_formats => input_formats_for_station}
           end
           station = CF::Station.create(station_params) do |s|
-            #say "New Station has been created of type => #{s.type}", :green
             say "Adding Station #{index}: #{s.type}", :green
+            display_error(line_title, "#{s.errors}") if s.errors.present?            
+
             # For Worker
             worker = station_file['station']['worker']
             number = worker['num_workers']
@@ -138,19 +152,23 @@ module Cf
               else
                 human_worker = CF::HumanWorker.new({:station => s, :number => number, :reward => reward, :stat_badge => stat_badge})
               end
+              
               if worker['skill_badges'].present?
                 skill_badges.each do |badge|
                   human_worker.badge = badge
                 end
               end
-              #say "New Worker has been created of type => #{worker_type}, Number => #{number} and Reward => #{reward}", :green
+
               say_status "worker", "#{number} Cloud #{pluralize(number, "Worker")} with reward of #{reward} #{pluralize(reward, "cent")}"
-            else
+              display_error(line_title, "#{human_worker.errors}") if human_worker.errors.present?
+            elsif worker_type =~ /robot/
               settings = worker['settings']
               robot_worker = CF::RobotWorker.create({:station => s, :type => worker_type, :settings => settings})
 
-              #say "New Worker has been created of type => #{worker_type} and settings => #{worker['settings']}", :green
               say_status "robot", "Robot worker: #{worker_type}"
+              display_error(line_title, "#{robot_worker.errors}") if robot_worker.errors.present?              
+            else
+              display_error(line_title, "Invalid worker type: #{worker_type}")
             end
 
             # Creation of Form
@@ -159,12 +177,18 @@ module Cf
               title = station_file['station']['task_form']['form_title']
               instruction = station_file['station']['task_form']['instruction']
               form = CF::TaskForm.create({:station => s, :title => title, :instruction => instruction}) do |f|
+                
                 # Creation of FormFields
+                say_status "form", "TaskForm '#{f.title}'"
+                display_error(line_title, "#{f.errors}") if f.errors.present?
+                
                 station_file['station']['task_form']['form_fields'].each do |form_field|
                   form_field_params = form_field.merge(:form => f)
                   field = CF::FormField.new(form_field_params.symbolize_keys)
+                  say_status "form_field", "FormField '#{field.form_field_params}'"
+                  display_error(line_title, field.errors) if field.errors.present?
                 end
-                say_status "form", "TaskForm '#{f.title}'"
+                
               end
 
             elsif station_file['station']['custom_task_form'].present?
@@ -179,8 +203,8 @@ module Cf
               js_file = station_file['station']['custom_task_form']['js']
               js = File.read("#{line_source}/station_#{station_file['station']['station_index']}/#{js_file}")
               form = CF::CustomTaskForm.create({:station => s, :title => title, :instruction => instruction, :raw_html => html, :raw_css => css, :raw_javascript => js})
-
               say_status "form", "CustomTaskForm '#{form.title}'"
+              display_error(line_title, "#{form.errors}") if form.errors.present?
             end
 
           end

data/lib/cf/cli/production.rb

@@ -1,19 +1,20 @@
 require 'thor/group'
 
-module Cf
-  class Production < Thor
+module Cf # :nodoc: all
+  class Production < Thor # :nodoc: all
     include Cf::Config
-
+    
+    no_tasks do
+      def extract_name(file_path)
+        Pathname.new(file_path).basename.to_s
+      end
+    end
+    
     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)
       
-      if title.nil?
-        say("The run title is required to start the production.", :red) and return
-      end
-      
-      run_title         = title.parameterize
       line_destination  = Dir.pwd
       yaml_source       = "#{line_destination}/line.yml"
       
@@ -24,14 +25,43 @@ module Cf
       line_yaml_dump = YAML::load(File.open(yaml_source))
       line_title = line_yaml_dump['title'].parameterize
 
-      if !options[:input_data].nil? 
+      if title.nil?
+        run_title       = "#{line_title}-#{Time.new.strftime('%y%b%e-%H%M%S')}"
+      else
+        run_title       = "#{title.parameterize}-#{Time.new.strftime('%y%b%e-%H%M%S')}"
+      end
+
+      if !options[:input_data].nil?
         input_data = "input/#{options[:input_data]}"
       else
-        input_data = "input/#{run_title}.csv"
+        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"
+
+            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 = "input/#{chosen_file}"
+        end
       end
       
       unless File.exist?(input_data)
-        say("The input data csv file named #{input_data} is missing.", :red) and return
+        say("The input data file named #{input_data} is missing.", :red) and return
       end
       
       set_target_uri(options[:live])
@@ -41,13 +71,13 @@ module Cf
       set_api_key(yaml_source)
       CF.account_name = CF::Account.info.name
       line = CF::Line.info(line_title)
-      input_data_path = "#{Dir.pwd}/#{input_data}"
+      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_path)
+        say "Creating a production run with title #{run_title}.", :green
+        run = CF::Run.create(line, run_title, input_data_file)
         if run.errors.blank?
-          say("A run with title #{run.title} created successfully.", :green)
-          say("View your run at http://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/runs/#{CF.account_name}/#{run.title}", :yellow)
+          say("Run created successfully.", :green)
+          say("View your run at http://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/runs/#{CF.account_name}/#{run.title}\n", :yellow)
         else
           say("Error: #{run.errors}", :red)
         end
@@ -56,9 +86,11 @@ module Cf
         say("Creating the line: #{line_title}", :green)
         Cf::Line.new.create
         # Now create a production run with the title run_title
-        run = CF::Run.create(CF::Line.info(line_title), run_title, input_data_path)
+        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?
-          say("A run with title #{run.title} using the line #{line_title} was successfully created.", :red)
+          say("Run created successfully.", :green)
+          say("View your run at http://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/runs/#{CF.account_name}/#{run.title}\n", :yellow)
         else
           say("Error: #{run.errors}", :red)
         end

data/lib/cf/cli/templates/sample-line/form.css

@@ -1,26 +1,50 @@
-body {background: grey;}
-
-#instructions {
-  text-align:center;
+body {
+  margin: 0 auto;
+  padding: 0;
+  color: #000;
+  width: 960px;
+  background: #302D2F;
+  font-family: georgia;
 }
-
-#image-field-wrapper {
-  min-width:1050px;
-  overflow:hidden;
+#wrapper {
+  background: #FFF;
+  position: relative;
+  padding:0 10px;
 }
-
-#field-panel {
-  float:left;
-  padding: 10px 10px 0 10px;
-  min-width:512px;
-  overflow:hidden;
+#header {
+  border-bottom: solid 1px grey;
+  padding: 10px;
+  height: 50px;
+  text-align: center;
+  font-size: 36px;
+  font-weight: bold;
+  color: #666666;
 }
 
-.input-field {
-  width:150px;
+ul{
+  list-style: decimal;
+}
+input[type=text] {
+  width:660px;
   margin:4px;
+  font-size: 12px;
+  height:40px;
+}
+input[type=submit]{
+  width: 160px;
+  height: 40px;
+  border: solid 1px black;
 }
 
-#gender, #age {
+#gender, #age, #location {
 	font-weight: bold;
+	color: #A9BED4;
+}
+a{
+  color: #007EB9;
+}
+#footer{
+  border-top: solid 1px grey;
+  padding: 10px;
+  text-align: center;
 }