cloudfactory 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2011-08-26)
+
+* Fixed the bug of creating multiple output formats for a line. Issue #352
+
 ## 0.2.0 (2011-08-26)
 
 * Line creation when doing production and if the line is not created is now removed. Fixed #283

data/lib/cf/cli/line.rb

@@ -267,14 +267,15 @@ module Cf # :nodoc: all
             end
 
           end
+        end
         
-          output_formats = line_dump['output_formats'].presence
-          if output_formats
-            output_format = CF::OutputFormat.new(output_formats.merge(:line => line))
-            say "Adding Output Format #{output_formats}", :green
-            display_error(line_title, "#{output_format.errors}") if output_format.errors.present?
-          end
+        output_formats = line_dump['output_formats'].presence
+        if output_formats
+          output_format = CF::OutputFormat.new(output_formats.merge(:line => line))
+          say "Adding Output Format #{output_formats}", :green
+          display_error(line_title, "#{output_format.errors}") if output_format.errors.present?
         end
+        
         say " ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁", :white
         say "Line was successfully created.", :green
         say "View your line at http://#{CF.account_name}.#{CF.api_url.split("/")[-2]}/lines/#{CF.account_name}/#{line.title}", :yellow

data/lib/cf/custom_task_form.rb

@@ -63,7 +63,7 @@ module CF
       instruction = CustomTaskForm.new(form)
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:title => #{self.title}, :instruction => #{self.instruction}, :raw_html => #{self.raw_html}, :raw_css => #{self.raw_css}, :raw_javascript => #{self.raw_javascript}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/form_field.rb

@@ -64,7 +64,7 @@ module CF
       end
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:id => => #{self.id}, :label => #{self.label}, :field_type => #{self.field_type}, :required => #{self.required}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/human_worker.rb

@@ -157,7 +157,7 @@ module CF
       self.skill_badges << resp.parsed_response['skill_badges']
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:id => => #{self.id}, :number => #{self.number}, :reward => #{self.reward}, :stat_badge => #{self.stat_badge},  :skill_badges => #{self.skill_badges}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/input_format.rb

@@ -15,7 +15,10 @@ module CF
     attr_accessor :id
     
     # Title of Line with which input_format is associated
-    attr_accessor :line_title, :errors
+    attr_accessor :line_title
+    
+    # Contains error message if any
+    attr_accessor :errors
     
     # ==Initializes a new input_format
     # ===Usage Example:
@@ -82,7 +85,7 @@ module CF
       get("/lines/#{CF.account_name}/#{line.title.downcase}/input_formats.json")
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:id => #{self.id}, :name => #{self.name}, :required => #{self.required}, :valid_type => #{self.valid_type}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/line.rb

@@ -26,7 +26,10 @@ module CF
     attr_accessor :input_formats
     
     # Contains Error Messages
-    attr_accessor :errors, :output_formats
+    attr_accessor :errors
+    
+    # output_formats of the final output for a line
+    attr_accessor :output_formats
 
     # ==Initializes a new line
     # ==Usage of line.new("line_name")
@@ -186,6 +189,10 @@ module CF
       @input_formats << input_formats_value
     end
 
+    # ==Specifies output format for a line
+    # ===Usage Example:
+    #   output_format = CF::OutputFormat.new({:station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+    #   line.output_formats output_format
     def output_formats output_format = nil
       if output_format
         settings = output_format.settings
@@ -205,7 +212,7 @@ module CF
       end
     end
     
-    def output_formats=(output_format)
+    def output_formats=(output_format) # :nodoc:
       @output_formats = output_format
     end
     # ==Returns the content of a line by making an Api call
@@ -247,6 +254,8 @@ module CF
     # ==Returns all the lines of an account
     # ===Syntax for all method is
     #   CF::Line.all
+    # OR
+    #   CF:Line.all(:page => 1)
     def self.all(options={})
       page = options[:page].presence
       if page
@@ -326,6 +335,9 @@ module CF
       return resp
     end
     
+    # ==Return all the associated elements of a line
+    # ===Usage Example:
+    #   line = CF::Line.inspect("line_title")
     def self.inspect(line_title)
       resp = get("/lines/#{CF.account_name}/#{line_title.downcase}/inspect.json")
       @errors = resp.error.message if resp.code != 200

data/lib/cf/output_format.rb

@@ -3,9 +3,19 @@ module CF
     require 'httparty'
     include Client
 
-    # type of the station, e.g. station = Station.new({:type => "Work"})
-    attr_accessor :settings, :errors, :line, :output_formats_settings
+    # output_format settings
+    attr_accessor :settings
     
+    # Contains error message if any
+    attr_accessor :errors
+    
+    # Line object for which output_format is specified
+    attr_accessor :line
+    
+    # ==Specifies output format for a line
+    # ===Usage Example:
+    #   output_format = CF::OutputFormat.new({:station_1 => [{:name => "First Name"}],:station_2 => [{:name => "Mobile", :except => true}]})
+    #   line.output_formats output_format
     def initialize(options={})
       if !options.blank?
         @settings = options

data/lib/cf/robot_worker.rb

@@ -89,7 +89,7 @@ module CF
       RobotWorker.new(options)
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:number => #{self.number}, :reward => #{self.reward}, :type => #{self.type}, :settings => #{self.settings}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/run.rb

@@ -85,7 +85,10 @@ module CF
     def self.create(line, title, file)
       Run.new(line, title, file)
     end
-
+    
+    # ==Adds units to an existing production Run
+    # ===Usage Example:
+    #   units = CF::Run.add_units({:run_title => "title", :file => "path_of_file"})
     def self.add_units(options={})
       units = options[:units].presence
       run_title = options[:run_title].presence
@@ -190,24 +193,33 @@ module CF
       return resp
     end
     
+    # ==Returns progress of the production run
+    # ===Usage Example:
+    #   progress = CF::Run.progress("run_title")
     def self.progress(run_title)
       get("/runs/#{CF.account_name}/#{run_title}/progress.json")
     end
     
-    def progress
+    def progress # :nodoc:
       self.class.get("/runs/#{CF.account_name}/#{self.title}/progress.json")
     end
     
+    # ==Returns progress details of the production run
+    # ===Usage Example:
+    #   progress = CF::Run.progress_details("run_title")
     def self.progress_details(run_title)
       resp = get("/runs/#{CF.account_name}/#{run_title}/details.json")
       return resp['progress_details']
     end
     
-    def progress_details
+    def progress_details # :nodoc:
       resp = self.class.get("/runs/#{CF.account_name}/#{self.title}/details.json")
       return resp['progress_details']
     end
     
+    # ==Returns all runs of a line
+    # ===Usage Example:
+    #   progress = CF::Run.all({:line_title => "line_title", :page => 1)
     def self.all(options={})
       page = options[:page].presence
       line_title = options[:line_title].presence
@@ -245,6 +257,9 @@ module CF
       end
     end
     
+    # ==Resumes the paused production run
+    # ===Usage Example:
+    #   resume_run = CF::Run.resume("run_title")
     def self.resume(run_title)
       resp = post("/runs/#{CF.account_name}/#{run_title}/resume.json")
       @errors = resp.error.message if resp.code != 200

data/lib/cf/station.rb

@@ -25,7 +25,10 @@ module CF
     attr_accessor :auto_judge
     
     # Contains Error Message if any
-    attr_accessor :errors, :batch_size
+    attr_accessor :errors
+    
+    # batch_size attribute, required for specifing size of batch
+    attr_accessor :batch_size
 
     # ==Initializes a new station
     # ===Usage Example:
@@ -300,7 +303,7 @@ module CF
       return resp
     end
     
-    def to_s
+    def to_s # :nodoc:
       if self.type == "TournamentStation"
         "{:type => #{self.type}, :index => #{self.index}, :line_title => #{self.line_title}, :station_input_formats => #{self.station_input_formats}, :jury_worker => #{self.jury_worker}, auto_judge => #{self.auto_judge}, :errors => #{self.errors}}"
       else

data/lib/cf/task_form.rb

@@ -106,7 +106,7 @@ module CF
       @form_fields << form_fields
     end
     
-    def to_s
+    def to_s # :nodoc:
       "{:title => #{self.title}, :instruction => #{self.instruction}, :form_fields => #{self.form_fields}, :errors => #{self.errors}}"
     end
   end

data/lib/cf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154621780 !ruby/object:Gem::Requirement
+  requirement: &2161058340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154621780
+  version_requirements: *2161058340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154621280 !ruby/object:Gem::Requirement
+  requirement: &2161057840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154621280
+  version_requirements: *2161057840
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2154620780 !ruby/object:Gem::Requirement
+  requirement: &2161057340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154620780
+  version_requirements: *2161057340
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154620400 !ruby/object:Gem::Requirement
+  requirement: &2161056960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154620400
+  version_requirements: *2161056960
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154619940 !ruby/object:Gem::Requirement
+  requirement: &2161056500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154619940
+  version_requirements: *2161056500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154619440 !ruby/object:Gem::Requirement
+  requirement: &2161056000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2154619440
+  version_requirements: *2161056000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157297800 !ruby/object:Gem::Requirement
+  requirement: &2161055580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157297800
+  version_requirements: *2161055580
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2157297260 !ruby/object:Gem::Requirement
+  requirement: &2161055040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157297260
+  version_requirements: *2161055040
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2157296760 !ruby/object:Gem::Requirement
+  requirement: &2161054540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2157296760
+  version_requirements: *2161054540
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2157296380 !ruby/object:Gem::Requirement
+  requirement: &2161054160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157296380
+  version_requirements: *2161054160
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2157295920 !ruby/object:Gem::Requirement
+  requirement: &2161053700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157295920
+  version_requirements: *2161053700
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2157295500 !ruby/object:Gem::Requirement
+  requirement: &2161053280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157295500
+  version_requirements: *2161053280
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2157295080 !ruby/object:Gem::Requirement
+  requirement: &2161052860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157295080
+  version_requirements: *2161052860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157294580 !ruby/object:Gem::Requirement
+  requirement: &2161052360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2157294580
+  version_requirements: *2161052360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157294080 !ruby/object:Gem::Requirement
+  requirement: &2155103440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157294080
+  version_requirements: *2155103440
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2157293620 !ruby/object:Gem::Requirement
+  requirement: &2155102980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157293620
+  version_requirements: *2155102980
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2157293240 !ruby/object:Gem::Requirement
+  requirement: &2155102600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157293240
+  version_requirements: *2155102600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157292780 !ruby/object:Gem::Requirement
+  requirement: &2155102140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157292780
+  version_requirements: *2155102140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157292280 !ruby/object:Gem::Requirement
+  requirement: &2155101640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2157292280
+  version_requirements: *2155101640
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2157291860 !ruby/object:Gem::Requirement
+  requirement: &2155101220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157291860
+  version_requirements: *2155101220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157291400 !ruby/object:Gem::Requirement
+  requirement: &2155100760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157291400
+  version_requirements: *2155100760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157290980 !ruby/object:Gem::Requirement
+  requirement: &2155100340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157290980
+  version_requirements: *2155100340
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2157290560 !ruby/object:Gem::Requirement
+  requirement: &2155099920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157290560
+  version_requirements: *2155099920
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com