cloudfactory 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.2 (2011-10-20)
+
+form generation template modified
+yaml validator modified as per new changes
+
 ## 0.4.1 (2011-10-20)
 
 * removed directory for custom forms from CLI

data/lib/cf/cli/form.rb

@@ -11,9 +11,7 @@ module Cf # :nodoc: all
 
     def generate_form_template
       line_destination = Dir.pwd
-      template("html_file.html.erb",   "#{line_destination}/station_#{station}/form.html")
-      template("css_file.css.erb",     "#{line_destination}/station_#{station}/form.css")
-      template("js_file.js.erb",       "#{line_destination}/station_#{station}/form.js")
+      template("html_file.html.erb", "#{line_destination}/station#{station}.html")
     end
   end
 
@@ -26,12 +24,12 @@ module Cf # :nodoc: all
 
     def generate_form_preview
       line_destination = Dir.pwd
-      template("form_preview.html.erb",   "#{line_destination}/station_#{station}/form_preview.html")
+      template("form_preview.html.erb", "#{line_destination}/station#{station}_preview.html")
     end
 
     def launch_preview
       line_destination = Dir.pwd
-      system "open #{line_destination}/station_#{station}/form_preview.html"
+      system "open #{line_destination}/station#{station}_preview.html"
     end
   end
 end
@@ -52,13 +50,13 @@ module Cf
         say("The current directory is not a valid line directory.", :red) and return
       end
 
-      FileUtils.rm_rf("#{line_destination}/station_#{options[:station]}", :verbose => true) if options.force? && Dir.exist?("#{line_destination}/station_#{options[:station]}")
-      if Dir.exist?("#{line_destination}/station_#{options[:station]}")
-        say "Skipping the form generation because the station_#{options[:station]} already exists with its custom form.\nUse the -f flag to force it to overwrite or check and delete the station_#{options[:station]} folder manually.", :red
+      FileUtils.rm_rf("#{line_destination}/station#{options[:station]}.html", :verbose => true) if options.force? && File.exist?("#{line_destination}/station#{options[:station]}.html")
+      if File.exist?("#{line_destination}/station#{options[:station]}.html")
+        say "Skipping the form generation because the station#{options[:station]}.html already exists with its custom form.\nUse the -f flag to force it to overwrite or check and delete the station#{options[:station]}.html file manually.", :red
       else
         say "Generating form for station #{options[:station]}", :green
         Cf::Newform.start([options[:station], options[:labels], options[:fields]])
-        say "A new custom task form created in station_#{options[:station]}."
+        say "A new custom task form has been created named station#{options[:station]}.html !!!", :green
       end
     end
 
@@ -69,9 +67,9 @@ module Cf
       unless File.exist?("#{line_destination}/line.yml")
         say("The current directory is not a valid line directory.", :red) and return
       end
-      if Dir.exist?("#{line_destination}/station_#{options[:station]}") and !Dir["#{line_destination}/station_#{options[:station]}/*"].empty?
+      if File.exist?("#{line_destination}/station#{options[:station]}.html")
         say "Generating preview form for station #{options[:station]}", :green
-        form_content = File.read("station_#{options[:station]}/form.html")
+        form_content = File.read("station#{options[:station]}.html")
         Cf::FormPreview.start([options[:station], form_content])
       else
         say "No form exists for station #{options[:station]}", :red

data/lib/cf/cli/line_yaml_validator.rb

@@ -44,6 +44,8 @@ module Cf
 
                 if station_type == "tournament"
                   jury_worker = station['station']['jury_worker']
+                  auto_judge = station['station']['auto_judge']
+                  errors << "Auto Judge enabled setting must be true in Block station #{i+1}!" if !auto_judge.nil? && auto_judge['enabled'] != true
                   if jury_worker.nil?
                     errors << "Jury worker setting is missing in Block station #{i+1}!"
                   elsif !jury_worker.nil?
@@ -140,7 +142,7 @@ module Cf
                         instruction = custom_task_form['instruction']
                         errors << "Form Instruction is missing in Block station #{i+1}!" if instruction.nil?
                       
-                        errors << "station#{i+1} is missing in folder #{Dir.pwd}/station_#{i+1} !" if !File.exist?("station#{i+1}.html")
+                        errors << "station#{i+1}.html is missing in folder #{Dir.pwd} !" if !File.exist?("station#{i+1}.html")
                                               # 
                                               # if File.exist?("#{Dir.pwd}")
                                               #   station_source = "#{Dir.pwd}/station_#{i+1}"

data/lib/cf/cli/templates/form_preview.html.erb

@@ -2,8 +2,11 @@
 <html lang="en">
   <head>
     <title>Form Preview</title>
+    <!-- Link external js and css files if you need.
+    
     <link href="form.css" media="screen, projection" rel="stylesheet" type="text/css" />
-    <script src="form.js" type="text/javascript"></script>
+    <script src="form.js" type="text/javascript"></script> 
+    -->
   </head>
   <!--[if lt IE 7 ]> <body class="ie6"> <![endif]-->
   <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->

data/lib/cf/cli/templates/html_file.html.erb

@@ -1,21 +1,23 @@
-<div id="station_<%= station %>_instructions" class="station_<%= station %> cf_form_instruction">
-  <ul>
-    <li>Sample bullet list of instruction</li>
-    <li>Sample bullet list of instruction</li>
-    <li>Sample bullet list of instruction</li>
-  </ul>
-</div>
-
-<div id="station_<%= station %>_form" class="station_<%= station %> cf_form_content">
-<%- labels.split(",").each do |label| -%>
-<label>{{<%= label %>}}</label>
-<%- end unless labels.nil? -%>
-
-<div id = "field-panel">
-<%-
-  fields.each_pair do |field_name, field_type|
--%>
-<p><label><%= field_name %></label><input id="<%= field_name.downcase %>" type="text" name="output[<%= field_name.downcase %>]" data-valid-type="<%= field_type.downcase %>" /></p>
-<%- end unless fields.blank? -%>
-</div>
-</div>
+<form>  
+  <div id="station_<%= station %>_instructions" class="station_<%= station %> cf_form_instruction">
+    <ul>
+      <li>Sample bullet list of instruction</li>
+      <li>Sample bullet list of instruction</li>
+      <li>Sample bullet list of instruction</li>
+    </ul>
+  </div>
+  
+  <div id="station_<%= station %>_form" class="station_<%= station %> cf_form_content">
+  <%- labels.split(",").each do |label| -%>
+  <label>{{<%= label %>}}</label>
+  <%- end unless labels.nil? -%>
+  
+  <div id = "field-panel">
+  <%-
+    fields.each_pair do |field_name, field_type|
+  -%>
+  <p><label><%= field_name %></label><input id="<%= field_name.downcase %>" type="text" name="output[<%= field_name.downcase %>]" data-valid-type="<%= field_type.downcase %>" /></p>
+  <%- end unless fields.blank? -%>
+  </div>
+  </div>
+</form>

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

@@ -80,7 +80,7 @@ stations:
       custom_task_form:
         form_title: Clink a link and paste in url
         instruction: Look through search results and find the best date
-        html: form.html
+        html: station2.html
 
   # Sample Station #3: ROBOT to email the person seeking a date with their recommended match!
   - station:

data/lib/cf/version.rb

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

data/spec/line_spec.rb

@@ -439,7 +439,7 @@ describe CF::Line do
     end
   end
 
-  context "get a line of other account" do
+  context "get a line of other account and using that line to create run under own account" do
     it "as public line" do
       WebMock.allow_net_connect!
       CF.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfactory
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154693260 !ruby/object:Gem::Requirement
+  requirement: &2154442200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154693260
+  version_requirements: *2154442200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154691240 !ruby/object:Gem::Requirement
+  requirement: &2154439280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154691240
+  version_requirements: *2154439280
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2154690520 !ruby/object:Gem::Requirement
+  requirement: &2154432420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154690520
+  version_requirements: *2154432420
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154689840 !ruby/object:Gem::Requirement
+  requirement: &2154430300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154689840
+  version_requirements: *2154430300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154688400 !ruby/object:Gem::Requirement
+  requirement: &2154425660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154688400
+  version_requirements: *2154425660
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154683820 !ruby/object:Gem::Requirement
+  requirement: &2154424520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2154683820
+  version_requirements: *2154424520
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2154682740 !ruby/object:Gem::Requirement
+  requirement: &2154423500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154682740
+  version_requirements: *2154423500
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2154680840 !ruby/object:Gem::Requirement
+  requirement: &2154421200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2154680840
+  version_requirements: *2154421200
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2154677800 !ruby/object:Gem::Requirement
+  requirement: &2154419020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2154677800
+  version_requirements: *2154419020
 - !ruby/object:Gem::Dependency
   name: millisami-csv-hash
-  requirement: &2154672600 !ruby/object:Gem::Requirement
+  requirement: &2154417960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154672600
+  version_requirements: *2154417960
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2154670200 !ruby/object:Gem::Requirement
+  requirement: &2154415540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154670200
+  version_requirements: *2154415540
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2154667660 !ruby/object:Gem::Requirement
+  requirement: &2154413760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154667660
+  version_requirements: *2154413760
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2154666820 !ruby/object:Gem::Requirement
+  requirement: &2154411120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154666820
+  version_requirements: *2154411120
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154662400 !ruby/object:Gem::Requirement
+  requirement: &2154410380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *2154662400
+  version_requirements: *2154410380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154640560 !ruby/object:Gem::Requirement
+  requirement: &2154400200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154640560
+  version_requirements: *2154400200
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &2154639100 !ruby/object:Gem::Requirement
+  requirement: &2154398740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2154639100
+  version_requirements: *2154398740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2154637140 !ruby/object:Gem::Requirement
+  requirement: &2154397760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154637140
+  version_requirements: *2154397760
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2154635380 !ruby/object:Gem::Requirement
+  requirement: &2154396360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154635380
+  version_requirements: *2154396360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154633760 !ruby/object:Gem::Requirement
+  requirement: &2154395020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 3.5.3
   type: :development
   prerelease: false
-  version_requirements: *2154633760
+  version_requirements: *2154395020
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2154632980 !ruby/object:Gem::Requirement
+  requirement: &2154394240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154632980
+  version_requirements: *2154394240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154632160 !ruby/object:Gem::Requirement
+  requirement: &2154383680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154632160
+  version_requirements: *2154383680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2154631420 !ruby/object:Gem::Requirement
+  requirement: &2154377880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154631420
+  version_requirements: *2154377880
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154630500 !ruby/object:Gem::Requirement
+  requirement: &2154369400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154630500
+  version_requirements: *2154369400
 description: A Ruby wrapper and CLI for to interact with Cloudfactory.com REST API
 email:
 - info@cloudfactory.com
@@ -309,10 +309,8 @@ files:
 - lib/cf/cli/line.rb
 - lib/cf/cli/line_yaml_validator.rb
 - lib/cf/cli/production.rb
-- lib/cf/cli/templates/css_file.css.erb
 - lib/cf/cli/templates/form_preview.html.erb
 - lib/cf/cli/templates/html_file.html.erb
-- lib/cf/cli/templates/js_file.js.erb
 - lib/cf/cli/templates/sample-line/form.html
 - lib/cf/cli/templates/sample-line/line.yml.erb
 - lib/cf/cli/templates/sample-line/sample-line.csv

data/lib/cf/cli/templates/css_file.css.erb

@@ -1,22 +0,0 @@
-body {background:red;}
-
-#instructions{
-	text-align:center;
-}
-
-#image-field-wrapper{
-	min-width:1050px;
-	overflow:hidden;
-}
-
-#field-panel{
-	float:left;
-	padding: 10px 10px 0 10px;
-	min-width:512px;
-	overflow:hidden;
-}
-
-.input-field{
-	width:150px;
-	margin:4px;
-}

data/lib/cf/cli/templates/js_file.js.erb

@@ -1,18 +0,0 @@
-<script src="http://code.jquery.com/jquery-latest.js"></script>
-<script type="text/javascript" src="http://www.bizcardarmy.com/javascripts/jquery.autocomplete-min.js"></script>
-<script type="text/javascript">
-$(document).ready(function(){
-	autocomplete_fields = ["first_name", "middle_name", "last_name", "company", "job_title", "city", "state", "zip"];
-
-	$.each(autocomplete_fields, function(index, value){
-		var inputField = "input." + value;
-		$(inputField).autocomplete({
-			serviceUrl: "http://www.bizcardarmy.com/cards/return_data_for_autocompletion.json",
-			maxHeight: 400,
-			width: 300,
-			zIndex: 9999,
-			params: { field: value }
-		});
-	});
-});
-</script>