cloudfactory 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.2 (2011-08-29)
+
+* Add a new command in CLI, cf whoami to show the current logged in credentials
+* Psych::SyntaxError and Syck::SyntaxError exceptions caught once again to show some intuitive error instead of scary backtrace
+* Tested when adding units for blank/no data
+* Output format bug fixed in GEM
+* Fixed miscellaneous bugs 
+
 ## 0.2.1 (2011-08-26)
 
 * Fixed the bug of creating multiple output formats for a line. Issue #352

data/bin/cf

@@ -13,6 +13,10 @@ 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"
+rescue Exception => exec
+  if (defined?(Syck::SyntaxError) && exec.is_a?(Syck::SyntaxError)) || (defined?(Psych::SyntaxError) && exec.is_a?(Psych::SyntaxError))
+    $stderr.puts "\n\tError during processing: #{$!.message}\n\n"
+  else
+    raise exec
+  end
 end

data/features/form_field.feature

@@ -0,0 +1,58 @@
+Feature: CLI Errors
+  In order to show the intuitive errors
+  As a CLI user
+  I want to get clear error messages in CLI
+  
+@announce, @too_slow_process
+Scenario: Invalid Form Field
+  Given a file named ".cf_credentials" with:
+  """
+  ---
+  :target_url: http://lvh.me:3000/api/
+  :api_version: v1
+  :api_key: 89ceebf739adbf59d34911f4f28b2fa0e1564fb6
+
+  """
+  And a file named "dater/line.yml" with:
+  """
+  title: dater
+  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: Look at a photo to determine the person's gender and approximate age
+          instruction: Click the photo link and then enter the person's gender and approximate age in the form below
+          form_fields:
+            - label: Gender
+              field_type: INVALID_TYPE
+              required: true
+              option_values:
+                - male
+                - female
+                - not sure
+            - label: Age
+              field_type: SB
+              required: true
+              option_values:
+                - Under 18
+                - 18 to 30
+                - 30 to 45
+                - 45 to 60
+                - Over 60
+  """
+  And I cd to "dater"
+  When I run `cf line create`
+  Then the output should match:
+    """
+    Field type cannot be INVALID_TYPE
+    """

data/features/run.feature

@@ -12,7 +12,6 @@ Feature: Create a production run on CF
     :api_key: 89ceebf739adbf59d34911f4f28b2fa0e1564fb6
   
     """
-
   @announce, @moderate_slow_process
   Scenario: Creating a production run without run title should be created using the "line-title-11aug10-hhmmss"
     Given a line exists with title "brandiator"

data/features/task_form.feature

@@ -0,0 +1,64 @@
+Feature: CLI Errors
+  In order to show the intuitive errors
+  As a CLI user
+  I want to get clear error messages in CLI
+  
+@announce, @too_slow_process
+Scenario: Invalid Task Form, without form_title and instruction
+  Given a file named ".cf_credentials" with:
+  """
+  ---
+  :target_url: http://lvh.me:3000/api/
+  :api_version: v1
+  :api_key: 89ceebf739adbf59d34911f4f28b2fa0e1564fb6
+
+  """
+  And a file named "dater2/line.yml" with:
+  """
+  title: dater2
+  department: Web Research
+  input_formats:
+    - name: email
+      required: true
+      valid_type: email         # email, url, number, date, phone
+    - name: location
+      required: true
+      valid_type: text          # email, url, number, date, phone
+    - name: photo
+      required: true
+      valid_type: url           # email, url, number, date, phone
+  stations:
+    - station:
+        station_index: 1
+        station_type: work      # work, improve, tournament
+        worker:
+          worker_type: human    # "human" or name of robot (google_translate_robot, etc)
+          num_workers: 1
+          reward: 5
+        task_form:
+          form_title: 
+          instruction: 
+          form_fields:
+            - label: Gender
+              field_type: radio_button
+              required: true
+              option_values:
+                - male
+                - female
+                - not sure
+            - label: Age
+              field_type: select_box
+              required: true
+              option_values:
+                - Under 18
+                - 18 to 30
+                - 30 to 45
+                - 45 to 60
+                - Over 60
+  """
+  And I cd to "dater2"
+  When I run `cf line create`
+  Then the output should match:
+    """
+    ["Title can't be blank", "Instruction can't be blank"]
+    """

data/features/whoami.feature

@@ -0,0 +1,12 @@
+Feature: Whoami credentials
+  In order to talk with cloud factory
+  As a CLI user
+  I want to know my email
+  
+  @announce, @moderate_slow_process
+  Scenario: Whoami
+    When I run `cf whoami?`
+    # Then the output should match:
+    #   """
+    #   john@doe.com and secret
+    #   """

data/lib/cf/cli.rb

@@ -37,6 +37,7 @@ module Cf # :nodoc: all
     map "-v" => :version
     
     desc "login", "Setup the cloudfactory credentials"
+
     def login
       email = ask("Enter your email:")
       passwd = ask_password("Enter the password: ")
@@ -60,6 +61,17 @@ module Cf # :nodoc: all
       end
     end
     
+    desc "whoami", "to know what credential you are using"
+    def whoami
+      if File.exists?(config_file)
+          yp = YAML::load(File.open(config_file,'r'))
+          say("\nAccount => #{yp[:account_name]}", :green)
+          say("Email => #{yp[:email]}\n", :green)
+      else
+          say("\nPlease login with cf login\n")
+      end
+    end
+    
     # desc "target", "Setup the cloudfactory credentials. e.g. cf target staging #=> http://sandbox.staging.cloudfactory.com (options: staging/development/production)"
     # def target(target_url=nil)
     #   if target_url.present?

data/lib/cf/cli/line.rb

@@ -83,24 +83,30 @@ module Cf # :nodoc: all
           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)
+            say("!!! Warning !!!\nThe following are the existing production runs based on this line.", :yellow)
             existing_runs = Cf::Production.new([],{'line' => line_title, 'all' => true})
             existing_runs.list
             
+            say("\n!!! Warning !!!\nDeleting this line will also delete all the existing production runs based on this line.\n", :yellow)
             delete_forcefully = agree("Do you still want to delete this line? [y/n] ")
+            say("\n")
             if delete_forcefully
-              CF::Line.destroy(line_title, :forced => true)
-              say("The line #{line_title} deleted successfully!", :yellow)
+              resp = CF::Line.destroy(line_title, :forced => true)
+              if resp.code != 200
+                say("Error: #{resp.error.message}\n", :red)
+              else
+                say("The line #{line_title} deleted successfully!\n", :yellow)
+              end
             else
-              say("Line deletion aborted!", :cyan)
+              say("Line deletion aborted!\n", :cyan)
             end
           else
             CF::Line.destroy(line_title)
-            say("The line #{line_title} deleted successfully!", :yellow)
+            say("The line #{line_title} deleted successfully!\n", :yellow)
           end
         end
       else
-        say("The line #{line_title} doesn't exist!", :yellow)
+        say("The line #{line_title} doesn't exist!\n", :yellow)
       end
     end
 

data/lib/cf/cli/production.rb

@@ -22,13 +22,7 @@ module Cf # :nodoc: all
       set_api_key
       CF.account_name = CF::Account.info.name
       
-      if File.exist?("#{yaml_source}")
-        line_yaml_dump = YAML::load(File.read(yaml_source).strip)
-        line_title = line_yaml_dump['title'].parameterize        
-        line = CF::Line.find(line_title)
-        line = Hashie::Mash.new(line)
-        say("#{line.error.message}", :red) and return if line.error.present?
-      elsif options[:line].present?
+      if options[:line].present?
         line = CF::Line.find(options[:line])
         line = Hashie::Mash.new(line)
         if line.error.blank?
@@ -36,6 +30,12 @@ module Cf # :nodoc: all
         else
           say("#{line.error.message}", :red) and return
         end
+      elsif File.exist?("#{yaml_source}")
+        line_yaml_dump = YAML::load(File.read(yaml_source).strip)
+        line_title = line_yaml_dump['title'].parameterize        
+        line = CF::Line.find(line_title)
+        line = Hashie::Mash.new(line)
+        say("#{line.error.message}", :red) and return if line.error.present? 
       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
@@ -161,10 +161,10 @@ module Cf # :nodoc: all
       runs = resp_runs['runs'].presence
       runs.sort! {|a, b| a['title'] <=> b['title'] }
       runs_table = table do |t|
-        t.headings = ["Run Title", 'URL']
+        t.headings = ["Run Title", 'URL', 'Status']
         runs.each do |run|
           run = Hashie::Mash.new(run)
-          t << [run.title, "http://#{CF.account_name}.cloudfactory.com/runs/#{CF.account_name}/#{run.title}"]
+          t << [run.title, "http://#{CF.account_name}.cloudfactory.com/runs/#{CF.account_name}/#{run.title}", run.status]
         end
       end
       say("\n")

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

@@ -1,3 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="UTF-8">
+<head>
+  <script src="http://code.jquery.com/jquery-latest.js"></script>
+</head>
 <body>
 <div id="wrapper">
   <div id="header">
@@ -26,4 +32,5 @@
     Copyright(c)
   </div>
 </div>
-</body>
+</body>
+</html>

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

@@ -1,16 +1,12 @@
-<script src="http://code.jquery.com/jquery-latest.js"></script>
-
-<script type="text/javascript">
-     $(document).ready(function() {
-	        var url = $("#instructions a").attr('href');
-	        var splitted_url = url.split("/");
-	        var gender = splitted_url[splitted_url.length - 3];
-	        var new_gender = gender.toLowerCase() == "male" ? "female" : "male";
-	        splitted_url[splitted_url.length - 3] = new_gender;
-	        var age = splitted_url[splitted_url.length - 1];
-	        age = decodeURI(age).split(" ")[0];
-	        splitted_url[splitted_url.length - 1] = age;
-	        var new_url = splitted_url.join("/");
-	        $("#instructions a").attr('href',new_url);
-	    });
-</script>
+$(document).ready(function() {
+    var url = $("#instructions a").attr('href');
+    var splitted_url = url.split("/");
+    var gender = splitted_url[splitted_url.length - 3];
+    var new_gender = gender.toLowerCase() == "male" ? "female" : "male";
+    splitted_url[splitted_url.length - 3] = new_gender;
+    var age = splitted_url[splitted_url.length - 1];
+    age = decodeURI(age).split(" ")[0];
+    splitted_url[splitted_url.length - 1] = age;
+    var new_url = splitted_url.join("/");
+    $("#instructions a").attr('href',new_url);
+});

data/lib/cf/run.rb

@@ -90,7 +90,7 @@ module CF
     # ===Usage Example:
     #   units = CF::Run.add_units({:run_title => "title", :file => "path_of_file"})
     def self.add_units(options={})
-      units = options[:units].presence
+      units = options[:units].nil? ? nil : options[:units]
       run_title = options[:run_title].presence
       file = options[:file].presence
       if units

data/lib/cf/version.rb

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

data/spec/run_spec.rb

@@ -528,7 +528,7 @@ module CF
         end
       end
       
-      xit "should throw errors for empty input while adding units" do
+      it "should throw errors for empty input while adding units" do
         VCR.use_cassette "run/block/adding_units_empty_errors", :record => :new_episodes do
         # WebMock.allow_net_connect!
           line = CF::Line.create("adding_units_error_1","Digitization") do |l|
@@ -545,8 +545,7 @@ module CF
           end
           run = CF::Run.create(line, "adding_units_error_run_1", [{"Company"=>"Apple,Inc","Website"=>"Apple.com"}])
           added_units = CF::Run.add_units(:run_title => "adding_units_error_run", :units => [])
-          added_units['error']['message'].should eql(["Extra Headers in file: [url]", "Insufficient Headers in file: [website]"])
-          run.title.should eql("adding_units_error_run_1")
+          added_units['error']['message'].should eql("Run document not found using selector: {:tenant_id=>BSON::ObjectId('4def16fa5511274d98000014'), :title=>\"adding_units_error_run\"}")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161058340 !ruby/object:Gem::Requirement
+  requirement: &2161055440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161058340
+  version_requirements: *2161055440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161057840 !ruby/object:Gem::Requirement
+  requirement: &2161054940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161057840
+  version_requirements: *2161054940
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2161057340 !ruby/object:Gem::Requirement
+  requirement: &2161083880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161057340
+  version_requirements: *2161083880
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2161056960 !ruby/object:Gem::Requirement
+  requirement: &2161083500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161056960
+  version_requirements: *2161083500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161056500 !ruby/object:Gem::Requirement
+  requirement: &2161083040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161056500
+  version_requirements: *2161083040
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2161056000 !ruby/object:Gem::Requirement
+  requirement: &2161082540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2161056000
+  version_requirements: *2161082540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2161055580 !ruby/object:Gem::Requirement
+  requirement: &2161082120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161055580
+  version_requirements: *2161082120
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2161055040 !ruby/object:Gem::Requirement
+  requirement: &2161081580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2161055040
+  version_requirements: *2161081580
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2161054540 !ruby/object:Gem::Requirement
+  requirement: &2161081080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2161054540
+  version_requirements: *2161081080
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2161054160 !ruby/object:Gem::Requirement
+  requirement: &2161080700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161054160
+  version_requirements: *2161080700
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2161053700 !ruby/object:Gem::Requirement
+  requirement: &2161080240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161053700
+  version_requirements: *2161080240
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2161053280 !ruby/object:Gem::Requirement
+  requirement: &2161079820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161053280
+  version_requirements: *2161079820
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2161052860 !ruby/object:Gem::Requirement
+  requirement: &2161079400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161052860
+  version_requirements: *2161079400
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161052360 !ruby/object:Gem::Requirement
+  requirement: &2161078900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2161052360
+  version_requirements: *2161078900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155103440 !ruby/object:Gem::Requirement
+  requirement: &2161078400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155103440
+  version_requirements: *2161078400
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2155102980 !ruby/object:Gem::Requirement
+  requirement: &2161077940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2155102980
+  version_requirements: *2161077940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2155102600 !ruby/object:Gem::Requirement
+  requirement: &2161077560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155102600
+  version_requirements: *2161077560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2155102140 !ruby/object:Gem::Requirement
+  requirement: &2161077100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155102140
+  version_requirements: *2161077100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155101640 !ruby/object:Gem::Requirement
+  requirement: &2161076600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2155101640
+  version_requirements: *2161076600
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2155101220 !ruby/object:Gem::Requirement
+  requirement: &2161076180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155101220
+  version_requirements: *2161076180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155100760 !ruby/object:Gem::Requirement
+  requirement: &2161092080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155100760
+  version_requirements: *2161092080
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2155100340 !ruby/object:Gem::Requirement
+  requirement: &2161091660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155100340
+  version_requirements: *2161091660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2155099920 !ruby/object:Gem::Requirement
+  requirement: &2161091240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155099920
+  version_requirements: *2161091240
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com
@@ -284,6 +284,7 @@ files:
 - features/error_form_field.feature
 - features/error_task_form.feature
 - features/errors.feature
+- features/form_field.feature
 - features/form_generation.feature
 - features/form_preview.feature
 - features/line_creation.feature
@@ -294,6 +295,8 @@ files:
 - features/support/cli_steps.rb
 - features/support/env.rb
 - features/target_url.feature
+- features/task_form.feature
+- features/whoami.feature
 - fixtures/api_credentials_example.yml
 - fixtures/cassette_library/.gitkeep
 - fixtures/input_data/media_converter_robot.csv
@@ -405,6 +408,7 @@ test_files:
 - features/error_form_field.feature
 - features/error_task_form.feature
 - features/errors.feature
+- features/form_field.feature
 - features/form_generation.feature
 - features/form_preview.feature
 - features/line_creation.feature
@@ -415,6 +419,8 @@ test_files:
 - features/support/cli_steps.rb
 - features/support/env.rb
 - features/target_url.feature
+- features/task_form.feature
+- features/whoami.feature
 - spec/account_spec.rb
 - spec/badge_spec.rb
 - spec/concept_tagging_robot_spec.rb