cloudfactory 0.1.13 → 0.1.14

data/lib/cf/cli/line.rb

@@ -51,6 +51,7 @@ module Cf # :nodoc: all
     
     desc "line delete", "delete the current line at http://cloudfactory.com"
     method_option :line, :type => :string, :aliases => "-l", :desc => "specify the line-title to delete"
+    method_option :force, :type => :boolean, :aliases => "-f", :default => false, :desc => "force delete the line"
     def delete
       if options['line'].blank?
         line_source = Dir.pwd
@@ -70,8 +71,21 @@ module Cf # :nodoc: all
       
       line = CF::Line.find(line_title)
       if line.errors.blank?
-        CF::Line.destroy(line_title)
-        say("The line #{line_title} deleted successfully!", :yellow)
+        if options.force
+          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)
+          else
+            say("Line deletion aborted!", :cyan)
+          end
+        end
       else
         say("The line #{line_title} doesn't exist!", :yellow)
       end

data/lib/cf/cli/line_yaml_validator.rb

@@ -48,7 +48,7 @@ module Cf
                   errors << "Jury worker setting is missing in Block station #{i+1}!"
                 elsif !jury_worker.nil?
                   reward = jury_worker['reward']
-                  errors << "Reward for worker is missing in Block station #{i+1}!" if reward.nil?
+                  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
@@ -151,7 +151,7 @@ module Cf
                       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).include?(field_type)
+                        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"

data/lib/cf/cli/production.rb

@@ -26,9 +26,9 @@ module Cf # :nodoc: all
       line_title = line_yaml_dump['title'].parameterize
 
       if title.nil?
-        run_title       = "#{line_title}-#{Time.new.strftime('%y%b%e-%H%M%S')}"
+        run_title       = "#{line_title}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
       else
-        run_title       = "#{title.parameterize}-#{Time.new.strftime('%y%b%e-%H%M%S')}"
+        run_title       = "#{title.parameterize}-#{Time.new.strftime('%y%b%e-%H%M%S')}".downcase
       end
 
       if !options[:input_data].nil?
@@ -47,7 +47,7 @@ module Cf # :nodoc: all
           chosen_file = nil
           choose do |menu|
             menu.header = "Input data files"
-            menu.prompt = "Please choose which file to be used as input data"
+            menu.prompt = "Please choose which file to be used as input data: "
 
             input_files.each do |item|
               menu.choice(extract_name(item)) do
@@ -73,11 +73,10 @@ module Cf # :nodoc: all
       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
+        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("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)
+          display_success_run(run)
         else
           say("Error: #{run.errors}", :red)
         end
@@ -86,17 +85,23 @@ module Cf # :nodoc: all
         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
+        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("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)
+          display_success_run(run)
         else
           say("Error: #{run.errors}", :red)
         end
       end
     end
 
+    no_tasks do
+      def display_success_run(run)
+        say("Run created successfully.", :green)
+        say("View your production at:\n\thttp://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/runs/#{CF.account_name}/#{run.title}/workerpool_preview\n", :green)
+      end
+    end
+    
     desc "production list", "list the production runs"
     method_option :line, :type => :string, :aliases => "-l", :desc => "the title of the line"
     def list

data/lib/cf/cli/templates/sample-line/line.yml.erb

@@ -10,6 +10,7 @@
 # api_key: fill_in_your_api_key #(optional)
 
 title: <%= title.underscore.dasherize %>
+public: false
 description: A shiny new assembly line ready for you to customize. Right now it is finding people dates (uncomment and try for fun) but you should just replace everything below accordingly for your line.
 
 # Department to build line in (See http://cloudfactory.com/developers/resources/department.html)
@@ -43,14 +44,14 @@ stations:
 #         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: radio_button    # short_answer, long_answer, radio_button, check_box, select_box
+#             field_type: radio_button    # short_answer, long_answer, radio_button, check_box, select_box, date, email, number
 #             required: true
 #             option_values:
 #               - male
 #               - female
 #               - not sure
 #           - label: Age
-#             field_type: select_box      # short_answer, long_answer, radio_button, check_box, select_box
+#             field_type: select_box      # short_answer, long_answer, radio_button, check_box, select_box, date, email, number
 #             required: true
 #             option_values:
 #                - 13 to 18

data/lib/cf/client.rb

@@ -25,7 +25,11 @@ module CF # :nodoc: all
       end
 
       def delete(*args)
-        handle_response  RestClient.delete("#{CF.api_url}#{CF.api_version}#{args.first}?api_key=#{CF.api_key}", :accept => 'json'){ |response, request, result| response }
+        if args.last == {:forced=>true}
+          handle_response  RestClient.delete("#{CF.api_url}#{CF.api_version}#{args.first}?api_key=#{CF.api_key}&&forced=true", :accept => 'json'){ |response, request, result| response }
+        else
+          handle_response  RestClient.delete("#{CF.api_url}#{CF.api_version}#{args.first}?api_key=#{CF.api_key}", :accept => 'json'){ |response, request, result| response }
+        end
       end
 
       def handle_response(response)

data/lib/cf/line.rb

@@ -37,7 +37,7 @@ module CF
       @stations =[]
       @title = title
       @department_name = department_name
-      @public = options[:public].present? ? options[:public] : false
+      @public = options[:public].present? ? options[:public] : true
       @description = options[:description]
       resp = self.class.post("/lines/#{CF.account_name}.json", {:line => {:title => title, :department_name => department_name, :public => @public, :description => @description}})
       if resp.code != 200
@@ -226,16 +226,61 @@ module CF
     # ===Usage Example:
     #   line = CF::Line.new("Digitize Card", "Survey")
     #   line.destroy
-    def destroy
-      self.class.delete("/lines/#{CF.account_name}/#{self.title.downcase}.json")
+    def destroy(options={})
+      force = options[:force]
+      if !force.nil?
+        resp = self.class.delete("/lines/#{CF.account_name}/#{self.title.downcase}.json", :forced => force)
+      else
+        resp = self.class.delete("/lines/#{CF.account_name}/#{self.title.downcase}.json")
+      end
+      if resp.code != 200
+        self.errors = resp.errors.message
+      end
+      return resp
     end
     
     # ==Deletes a line by passing it's title
     # ===Usage Example:
     #   line = CF::Line.new("line_title", "Survey")
     #   CF::Line.destroy("line_title")
-    def self.destroy(title)
-      delete("/lines/#{CF.account_name}/#{title.downcase}.json")
+    def self.destroy(title, options={})
+      forced = options[:forced]
+      if forced
+        resp = delete("/lines/#{CF.account_name}/#{title.downcase}.json", {:forced => forced})
+      else
+        resp = delete("/lines/#{CF.account_name}/#{title.downcase}.json")
+      end
+    end
+    
+    def self.details(line_title)
+      resp = get("/lines/#{CF.account_name}/#{line_title.downcase}/inspect.json")
+      send_resp = resp.to_hash
+      @line_input_formats = []
+      resp.input_formats.each do |l_i|
+        @line_input_formats << l_i.to_hash
+      end
+      send_resp.delete("input_formats")
+      send_resp.merge!("input_formats" => @line_input_formats)
+      @stations = []
+      resp.stations.each do |s|
+        @station_input_formats = []
+        s.input_formats.each do |i|
+          @station_input_formats << i.to_hash
+        end
+        @station_form_fields = []
+        s.form_fields.each do |f|
+          @station_form_fields << f.to_hash
+        end
+        temp_station = s.to_hash
+        temp_station.delete("form_fields")
+        temp_station.merge!("form_fields" => @station_form_fields)
+        temp_station.delete("input_formats")
+        temp_station.merge!("input_formats" => @station_input_formats)
+        @stations << temp_station
+      end
+      send_resp.delete("stations")
+      send_resp.merge!("stations" => @stations)
+      return send_resp
     end
   end
 end

data/lib/cf/version.rb

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

data/spec/line_spec.rb

@@ -319,4 +319,58 @@ describe CF::Line do
       end
     end
   end
+  
+  context "delete line whose production run is already created" do
+    it "it should throw error and must be deleted if forced true is passed" do
+      VCR.use_cassette "lines/block/delete-line-of-active-run", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+        line = CF::Line.create("delete_line_of_run","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, "delete_line_of_run_run", File.expand_path("../../fixtures/input_data/test.csv", __FILE__))
+        
+        delete = CF::Line.destroy("delete_line_of_run")
+        delete.error.message.should eql("cannot delete the line, Active runs exists. use forced delete if you still want to delete the line.")
+        delete.code.should_not eql(200)
+        
+        forced_delete = CF::Line.destroy("delete_line_of_run", :forced => true)
+
+        search_line = CF::Line.find("delete_line_of_run")
+        search_line.code.should eql(404)
+        search_line.error.message.should eql("Line document not found using selector: {:public=>true, :title=>\"delete_line_of_run\"}")
+      end
+    end
+  end
+  
+  context "returns all the associated elements of line" do
+    it "it give details of line" do
+      VCR.use_cassette "lines/block/line-details", :record => :new_episodes do
+        # WebMock.allow_net_connect!
+        line = CF::Line.create("line_details","Digitization") do |l|
+          CF::InputFormat.new({:line => l, :name => "Company", :required => true, :valid_type => "general"})
+          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"})
+            end
+          end
+        end
+        line_details = CF::Line.details("line_details")
+        line_input_format_id = line_details['input_formats'].first['id']
+        from_field_id = line_details['stations'].first['form_fields'].first['id']
+        station_input_format_id = line_details['stations'].first['input_formats'].first['id']
+        line_details.should eql({"title"=>"line_details", "description"=>"", "public"=>false, "department"=>{"name"=>"Digitization"}, "app"=>{"name"=>"default", "email"=>"manish.das@sprout-technology.com", "notification_url"=>"http://www.cloudfactory.com"}, "code"=>200, "input_formats"=>[{"id"=>"#{line_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}], "stations"=>[{"index"=>1, "type"=>"WorkStation", "worker"=>{"number"=>1, "reward"=>20, "type"=>"HumanWorker", "stat_badge"=>{"approval_rating"=>80, "abandonment_rate"=>30, "country"=>nil}}, "form"=>{"title"=>"Enter text from a business card image", "instruction"=>"Describe"}, "form_fields"=>[{"id"=>"#{from_field_id}", "label"=>"First Name", "field_type"=>"short_answer", "hint"=>nil, "required"=>true, "unique"=>nil, "hide_label"=>nil, "value"=>nil}], "input_formats"=>[{"id"=>"#{station_input_format_id}", "name"=>"Company", "required"=>true, "valid_type"=>"general", "source_station_index"=>0}]}]})
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156819940 !ruby/object:Gem::Requirement
+  requirement: &2162151040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156819940
+  version_requirements: *2162151040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157747940 !ruby/object:Gem::Requirement
+  requirement: &2162150540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157747940
+  version_requirements: *2162150540
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2157747440 !ruby/object:Gem::Requirement
+  requirement: &2162150040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157747440
+  version_requirements: *2162150040
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157747060 !ruby/object:Gem::Requirement
+  requirement: &2162149660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157747060
+  version_requirements: *2162149660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157746600 !ruby/object:Gem::Requirement
+  requirement: &2162165580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157746600
+  version_requirements: *2162165580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2157746100 !ruby/object:Gem::Requirement
+  requirement: &2162165080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157746100
+  version_requirements: *2162165080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157745680 !ruby/object:Gem::Requirement
+  requirement: &2162164660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157745680
+  version_requirements: *2162164660
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2157745140 !ruby/object:Gem::Requirement
+  requirement: &2162164120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *2157745140
+  version_requirements: *2162164120
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2157744640 !ruby/object:Gem::Requirement
+  requirement: &2162163620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157744640
+  version_requirements: *2162163620
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2157744260 !ruby/object:Gem::Requirement
+  requirement: &2162163240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157744260
+  version_requirements: *2162163240
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2157743800 !ruby/object:Gem::Requirement
+  requirement: &2162162780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157743800
+  version_requirements: *2162162780
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2157743380 !ruby/object:Gem::Requirement
+  requirement: &2162162360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157743380
+  version_requirements: *2162162360
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157742880 !ruby/object:Gem::Requirement
+  requirement: &2162161860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2157742880
+  version_requirements: *2162161860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157742380 !ruby/object:Gem::Requirement
+  requirement: &2162161360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157742380
+  version_requirements: *2162161360
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2157741920 !ruby/object:Gem::Requirement
+  requirement: &2162160900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157741920
+  version_requirements: *2162160900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2157741540 !ruby/object:Gem::Requirement
+  requirement: &2162160520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157741540
+  version_requirements: *2162160520
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157741080 !ruby/object:Gem::Requirement
+  requirement: &2162160060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157741080
+  version_requirements: *2162160060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157740580 !ruby/object:Gem::Requirement
+  requirement: &2162159560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2157740580
+  version_requirements: *2162159560
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2157740160 !ruby/object:Gem::Requirement
+  requirement: &2162159140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157740160
+  version_requirements: *2162159140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157756080 !ruby/object:Gem::Requirement
+  requirement: &2162158680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157756080
+  version_requirements: *2162158680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157755660 !ruby/object:Gem::Requirement
+  requirement: &2162158260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157755660
+  version_requirements: *2162158260
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2157755240 !ruby/object:Gem::Requirement
+  requirement: &2162157840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157755240
+  version_requirements: *2162157840
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com