stackfu 0.1.7 → 0.1.8

data/Manifest

@@ -5,13 +5,6 @@ README.md
 Rakefile
 autotest/discover.rb
 bin/stackfu
-firewall/config/01-controls.yml
-firewall/config/02-requirements.yml
-firewall/config/03-executions.yml
-firewall/config/04-validations.yml
-firewall/executables/configure_ufw.sh.erb
-firewall/executables/install_ufw.sh.erb
-firewall/script.yml
 lib/stackfu.rb
 lib/stackfu/api_hooks.rb
 lib/stackfu/app.rb
@@ -49,6 +42,8 @@ spec/fixtures/scripts/mongo/deploy.json
 spec/fixtures/scripts/none.json
 spec/fixtures/scripts/not_found.json
 spec/fixtures/scripts/password.json
+spec/fixtures/scripts/pwned.json
+spec/fixtures/scripts/pwned1.json
 spec/fixtures/scripts/script_not_found.json
 spec/fixtures/servers/all.json
 spec/fixtures/servers/cannot_deploy.json
@@ -78,6 +73,7 @@ stackfu-installer/script/resque_installation.sh.erb
 stackfu-installer/script/ruby_environment.sh.erb
 stackfu-installer/script/stackfu.sh.erb
 stackfu-installer/stack.yml
+stackfu.gemspec
 templates/01-controls.yml.erb
 templates/02-requirements.yml.erb
 templates/03-executions.yml.erb

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('stackfu', '0.1.7') do |p|  
+Echoe.new('stackfu', '0.1.8') do |p|  
   p.description     = "StackFu Backend"  
   p.url             = "http://stackfu.com/cli"  
   p.author          = "Felipe Coury"

data/lib/stackfu/commands/dump_command.rb

@@ -12,7 +12,13 @@ module StackFu::Commands
       
       script = spinner { 
         begin
-          Script.find(script_name) 
+          if script_name.include?('/')
+            user_name, script_name = script_name.split('/')
+            user = User.new(:id => user_name)
+            Script.new(user.get(script_name))
+          else
+            Script.find(script_name)
+          end
         rescue ActiveResource::ResourceNotFound 
         end
       }
@@ -36,9 +42,37 @@ module StackFu::Commands
         
         if script.respond_to?(:controls)
           controls = map script.controls, "controls" do |c|
-            { "name"  => c.name,
-              "label" => c.label,
-              "type"  => c._type }
+            options = {}
+            validations = {}
+            validation_messages = {}
+            
+            if c.respond_to?(:options) and !c.options.empty?
+              options = { 
+                "options" => c.options
+              }
+            end
+
+            if c.respond_to?(:validations) and !c.validations.empty?
+              validations = { 
+                "validations" => c.validations.attributes.to_hash
+              }
+            end
+            
+            if c.respond_to?(:validation_messages) and !c.validation_messages.empty?
+              validation_messages = { 
+                "validation_messages" => c.validation_messages.attributes.to_hash
+              }
+            end
+            
+            required = 'false'
+            if c.respond_to?(:required)
+              required = c.required.to_s
+            end
+            
+            { "name"     => c.name,
+              "label"    => c.label,
+              "type"     => c._type,
+              "required" => required }.merge(validations).merge(validation_messages).merge(options)
           end
         else
           controls = []

data/lib/stackfu/commands/publish_command.rb

@@ -1,4 +1,6 @@
 module StackFu::Commands
+  class CheckFailed < StandardError; end
+
   class PublishCommand < Command
     include StackFu::ApiHooks
     aliases :pub
@@ -32,99 +34,101 @@ module StackFu::Commands
           "Make sure you have a file named 'stack.yml', 'plugin.yml' or use 'stackfu generate' for creating a new stack."
       end
       
-      begin
-        stack_spec = read_and_validate(what)
+      silently do
+        begin
+          stack_spec = read_and_validate(what)
         
-        if @errors.keys.any?
-          error format_error
-          return
-        end
+          if @errors.keys.any?
+            error format_error
+            return
+          end
       
-        %w[controls requirements executions validations].each_with_index do |item, i|
-          if (yaml = read("config/0#{i+1}-#{item}.yml"))
-            yaml.gsub!("type:", "_type:")
-            if (from_yaml = YAML.load(yaml))
-              if item == 'requirements' or item == 'validations'
-                buffer = []
-                from_yaml[item].each do |itm|
-                  itm["params"] = { "data" => itm.delete("data") }
-                  buffer << itm
+          %w[controls requirements executions validations].each_with_index do |item, i|
+            if (yaml = read("config/0#{i+1}-#{item}.yml"))
+              yaml.gsub!("type:", "_type:")
+              if (from_yaml = YAML.load(yaml))
+                if item == 'requirements' or item == 'validations'
+                  buffer = []
+                  from_yaml[item].each do |itm|
+                    itm["params"] = { "data" => itm.delete("data") }
+                    buffer << itm
+                  end
+                  from_yaml[item] = buffer
                 end
-                from_yaml[item] = buffer
-              end
               
-              stack_spec[item == "scripts" ? "executions" : item] = from_yaml[item]
+                stack_spec[item == "scripts" ? "executions" : item] = from_yaml[item]
+              end
             end
           end
-        end
-        
-        unless stack_spec["executions"].present?
-          error "To publish a #{what} you have to define at least one execution.",
-            "Take a look at the executions descriptor file config/03-executions.yml for more information.\nYou can also use 'stackfu generate stack_name script_name:script' command to auto-generate a sample execution."
-          return false
-        end
-      
-        return unless stack_spec["executions"].each do |script|
-          template = "executables/#{script["file"]}.sh.erb"
         
-          begin
-            script["body"] = read(template)
-          rescue Errno::ENOENT
-            error "The template file for the script '#{script["description"]}' was not found.", "This script has an executable called '#{script["description"]}', and the template for it should be in a file called executables/#{script["file"]}.sh.erb."
-            break false
+          unless stack_spec["executions"].present?
+            error "To publish a #{what} you have to define at least one execution.",
+              "Take a look at the executions descriptor file config/03-executions.yml for more information.\nYou can also use 'stackfu generate stack_name script_name:script' command to auto-generate a sample execution."
+            return false
           end
+      
+          return unless stack_spec["executions"].each do |script|
+            template = "executables/#{script["file"]}.sh.erb"
         
-          true
-        end
+            begin
+              script["body"] = read(template)
+            rescue Errno::ENOENT
+              error "The template file for the script '#{script["description"]}' was not found.", "This script has an executable called '#{script["description"]}', and the template for it should be in a file called executables/#{script["file"]}.sh.erb."
+              break false
+            end
         
-        item_class = StackFu::ApiHooks.const_get("#{what.to_s.classify}")
-        item_class.format = :json
-
-        begin
-          stack = item_class.find(stack_spec["name"])
-        rescue ActiveResource::ResourceNotFound 
-        rescue NoMethodError
-          if $!.message =~ /closed\?/
-            raise Errno::ECONNREFUSED
-          else
-            raise
+            true
           end
-        end
+        
+          item_class = StackFu::ApiHooks.const_get("#{what.to_s.classify}")
+          item_class.format = :json
 
-        if stack
-          unless options[:update]
-            if agree("You already have a #{what} named #{stack_spec["name"]}. Do you want to update it?")
-              puts ""
-              puts "Tip: Next time you can avoid this question using 'stack pub --update'."
-              puts ""
+          begin
+            stack = item_class.find(stack_spec["name"])
+          rescue ActiveResource::ResourceNotFound 
+          rescue NoMethodError
+            if $!.message =~ /closed\?/
+              raise Errno::ECONNREFUSED
             else
-              puts "Aborted."
-              return false
+              raise
             end
           end
+
+          if stack
+            unless options[:update]
+              if agree("You already have a #{what} named #{stack_spec["name"]}. Do you want to update it?")
+                puts ""
+                puts "Tip: Next time you can avoid this question using 'stack pub --update'."
+                puts ""
+              else
+                puts "Aborted."
+                return false
+              end
+            end
         
-          begin
-            item_class.delete(stack.name)
-          rescue ActiveResource::ResourceNotFound 
-            puts "There was a problem updating your #{what}. Please report this problem at support@stackfu.com or try again in a few minutes."
-            return
+            begin
+              item_class.delete(stack.name)
+            rescue ActiveResource::ResourceNotFound 
+              puts "There was a problem updating your #{what}. Please report this problem at support@stackfu.com or try again in a few minutes."
+              return
+            end
           end
-        end
       
-        puts "Publishing #{what} #{stack_spec["name"]}..."
+          puts "Publishing #{what} #{stack_spec["name"]}..."
 
-        stack = item_class.new(stack_spec)
+          stack = item_class.new(stack_spec)
 
-        if publish(stack)
-          done "#{what.to_s.titleize} #{stack.name} published."
-        else
-          error "Could not publish your stack: #{stack.errors.full_messages.to_s}"
+          if publish(stack)
+            done "#{what.to_s.titleize} #{stack.name} published."
+          else
+            error "Could not publish your stack: #{stack.errors.full_messages.to_s}"
+          end
+        rescue ActiveResource::ServerError
+          error "#{$!.message}"
+        rescue Errno::ENOENT
+          error "There was an error opening your file descriptor"
+          raise
         end
-      rescue ActiveResource::ServerError
-        error "#{$!.message}"
-      rescue Errno::ENOENT
-        error "There was an error opening your file descriptor"
-        raise
       end
     end
   
@@ -137,6 +141,21 @@ module StackFu::Commands
       false
     end
     
+    def add_error(error)
+      (@errors[@file]||=[]) << error.gsub(/'(.*)'/, '\1'.foreground(:blue).bright)
+    end
+    
+    def check2(file)
+      @file = file
+      begin
+        block_given? ? yield : false
+        true
+      rescue CheckFailed
+        (@errors[file]||=[]) << $!.message.gsub(/'(.*)'/, '\1'.foreground(:blue).bright)
+        false
+      end
+    end
+    
     def read_and_check(yml)
       begin
         return YAML.load(read(yml))
@@ -194,11 +213,82 @@ module StackFu::Commands
       end
     end
     
+    def validate_control_type(item)
+      check('config/01-controls.yml', "invalid type '#{item["type"]}' for control #{item["name"].try(:foreground, :blue).try(:bright)}") { 
+        %w(Textbox Numericbox Password Radio Combobox).include? item['type']
+      }
+    end
+    
+    def option_needed?(item)
+      item['type'] == 'Radio' or item['type'] == 'Combobox'
+    end
+    
+    def validate_options_presence(item)
+      check('config/01-controls.yml', "missing options for #{item["type"]} control #{item["name"].try(:foreground, :blue).try(:bright)}") { 
+        if option_needed?(item)
+          !item['options'].nil?
+        else
+          true
+        end
+      }
+    end
+    
+    def validate_options_format(item)
+      check('config/01-controls.yml', "invalid options format for #{item["type"]} control #{item["name"].try(:foreground, :blue).try(:bright)}") { 
+        if option_needed?(item)
+          if !item['options'].nil?
+            begin
+              valid = true
+              if item['options'].is_a?(Array)
+                item['options'].each do |option|
+                  valid = false unless option.is_a?(Array) && option.size == 2
+                end
+              else
+                valid = false
+              end
+              valid
+            rescue ArgumentError
+              false
+            end
+          else
+            true
+          end
+        else
+          true
+        end
+      }
+    end
+    
+    def allows_validation?(item)
+      ['Textbox', 'Numericbox', 'Password'].include? item['type']
+    end
+
+    ValidationTypes = %w(matches required minlength maxlength rangelength min max range email url date dateISO number digits equalTo)
+    
+    def valid_validation?(type, value)
+      ValidationTypes.include?(type)
+    end
+    
+    def validate_validations_format(item)
+      check2('config/01-controls.yml') do
+        return unless allows_validation?(item) and !(vals = item['validations']).nil?
+        
+        error = "invalid validations format for #{item["type"]} #{blue(item["name"])}"
+        raise CheckFailed, error unless vals.is_a?(Hash)
+        
+        vals.each_pair do |type, value|
+          message = "invalid validation type for #{item["type"]} #{blue(item["name"])}: #{red(type)}" 
+          add_error message unless valid_validation?(type, value)
+        end
+      end
+    end
+    
     def validate_controls
       validate_spec '01', 'controls', 'name', ['name', 'type'] do |item, i|
-        check('config/01-controls.yml', "invalid type '#{item["type"]}' for control #{item["name"].try(:foreground, :blue).try(:bright)}") { 
-          %w(Textbox Numericbox Password).include? item['type']
-        }
+        validate_control_type(item) && 
+        validate_options_presence(item) &&
+        validate_options_format(item) &&
+        validate_validations_format(item)
       end
     end
     
@@ -234,5 +324,13 @@ module StackFu::Commands
   
     def load_stack
     end
+    
+    def blue(s)
+      s.try(:foreground, :blue).try(:bright)
+    end
+    
+    def red(s)
+      s.try(:foreground, :red)
+    end
   end
 end

data/lib/stackfu.rb

@@ -49,10 +49,11 @@ require "#{dir}/commands/list_command"
 require "#{dir}/commands/deploy_command"
 require "#{dir}/commands/dump_command"
 
+ActiveSupport::Deprecation.silenced = true
+
 module StackFu
-  VERSION = '0.1.7'
-  API = "https://beta.stackfu.com"
-  # API = "http://localhost:3000"
+  VERSION = '0.1.8'
+  API = ENV['STACKFU_ENV'] == 'development' ? "http://localhost:3000" : "https://beta.stackfu.com"
   CONFIG_FILE = "#{ENV['HOME']}/.stackfu"
 
   include StackFu::OperatingSystems
@@ -101,3 +102,11 @@ end
 #     return http
 #   end
 # end
+
+def silently(&block)
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = block.call
+  $VERBOSE = warn_level
+  result
+end

data/spec/fixtures/scripts/pwned.json

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK 
+X-Ua-Compatible: IE=Edge,chrome=1
+Etag: "178597adbc4a0ad53d5f17fce7b06016"
+Connection: Keep-Alive
+Content-Type: application/json; charset=utf-8
+Date: Thu, 14 Oct 2010 21:34:02 GMT
+Server: WEBrick/1.3.1 (Ruby/1.8.7/2009-12-24)
+X-Runtime: 1.295549
+Content-Length: 984
+Cache-Control: max-age=0, private, must-revalidate
+
+{"controls":[{"required":true,"name":"grade","label":"Grade","_id":"4cb776acd489e8ee82000045","_type":"Textbox","validations":{"maxlength":1,"matches":"^[A|B|C]$"},"validation_messages":{"maxlength":"must have 1 or less characters!","matches":"must be A, B or C"}},{"required":false,"name":"school","label":"School","_id":"4cb776acd489e8ee82000046","_type":"Radio","options":[[1,"one"]]}],"name":"pwned","slug":"pwned","created_at":"2010-10-14T21:31:24Z","deploy_count":0,"updated_at":"2010-10-14T21:31:24Z","_id":"4cb776acd489e8ee82000048","tags":[],"watching_users_count":1,"user_id":"4c8585167d7c425923000003","executions":[{"body":"# \n# mydear.sh\n# Thu Oct 14 11:08:19 -0300 2010\n#\n\n# TODO: Replace the contents of this file with \"Mydear\"\necho [<%= Time.now %>] Installing -- Mydear\n","_id":"4cb776acd489e8ee82000047","_type":"Executable","file":"mydear","description":"Mydear"}],"description":"Add your description here","watching_user_ids":["4c8585167d7c425923000003"]}

data/spec/fixtures/scripts/pwned1.json

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK 
+X-Ua-Compatible: IE=Edge,chrome=1
+Etag: "178597adbc4a0ad53d5f17fce7b06016"
+Connection: Keep-Alive
+Content-Type: application/json; charset=utf-8
+Date: Thu, 14 Oct 2010 21:34:02 GMT
+Server: WEBrick/1.3.1 (Ruby/1.8.7/2009-12-24)
+X-Runtime: 1.295549
+Content-Length: 984
+Cache-Control: max-age=0, private, must-revalidate
+
+{"controls":[{"required":true,"name":"grade","label":"Grade","_id":"4cb776acd489e8ee82000045","_type":"Textbox","validations":{"maxlength":1,"matches":"^[A|B|C]$"},"validation_messages":{"maxlength":"must have 1 or less characters!","matches":"must be A, B or C"}},{"required":false,"name":"school","label":"School","_id":"4cb776acd489e8ee82000046","_type":"Radio","options":[[1,"one"]]}],"name":"pwned","slug":"pwned","created_at":"2010-10-14T21:31:24Z","deploy_count":0,"updated_at":"2010-10-14T21:31:24Z","_id":"4cb776acd489e8ee82000048","tags":[],"watching_users_count":1,"user_id":"4c8585167d7c425923000003","executions":[{"body":"# \n# mydear.sh\n# Thu Oct 14 11:08:19 -0300 2010\n#\n\n# TODO: Replace the contents of this file with \"Mydear\"\necho [<%= Time.now %>] Installing -- Mydear\n","_id":"4cb776acd489e8ee82000047","_type":"Executable","file":"mydear","description":"Mydear"}],"description":"Add your description here","watching_user_ids":["4c8585167d7c425923000003"]}

data/spec/stackfu/commands/dump_command_spec.rb

@@ -24,10 +24,19 @@ describe StackFu::Commands::DumpCommand do
   end
   
   context "valid script" do
+    before(:each) do
+      StackFu::Commands::DumpCommand.any_instance.tap do |cmd|
+        cmd.stubs(:mkdir)
+      end
+    end
+  
     it "creates a directory structure that describes the stack" do
       prepare :get, "/scripts/firewall.json", "/scripts/firewall.json"
 
-      StackFu::Commands::DumpCommand.any_instance.expects(:directory?).with("firewall").returns(false)
+      StackFu::Commands::DumpCommand.any_instance.tap do |cmd|
+        cmd.expects(:directory?).with("firewall").returns(false)
+        cmd.stubs(:write_file)
+      end
 
       command "dump firewall"
       stdout.should =~ /^\tcreate  firewall\//
@@ -43,5 +52,64 @@ describe StackFu::Commands::DumpCommand do
       stdout.should =~ /^\tcreate  firewall\/executables\/configure_ufw.sh.erb/
       stdout.should =~ /^Success: Script firewall dumped/
     end
+    
+    it "dumps required" do
+      prepare :get, "/scripts/pwned.json"
+
+      StackFu::Commands::DumpCommand.any_instance.tap do |cmd|
+        cmd.expects(:directory?).with("pwned").returns(false)
+        cmd.expects(:write_file).at_least_once.with() do |name, contents|
+          if name == 'pwned/config/01-controls.yml'
+            controls = YAML.load(contents)["controls"]
+
+            grade_ctrl = controls.select { |c| c['name'] == 'grade' }.first
+            grade_ctrl["required"].should == 'true'
+          end
+          true
+        end
+      end
+      
+      # TODO: check create file for controls
+
+      command "dump pwned"
+    end
+
+    it "dumps validations" do
+      prepare :get, "/scripts/pwned.json"
+
+      StackFu::Commands::DumpCommand.any_instance.tap do |cmd|
+        cmd.expects(:directory?).with("pwned").returns(false)
+        cmd.expects(:write_file).at_least_once.with() do |name, contents|
+          if name == 'pwned/config/01-controls.yml'
+            controls = YAML.load(contents)["controls"]
+            
+            options = controls.select { |c| c['name'] == 'school' }.first["options"]
+            options.should_not be_nil
+            
+            grade_ctrl = controls.select { |c| c['name'] == 'grade' }.first
+            
+            validations = grade_ctrl["validations"]
+            validations.should_not be_nil
+            validations.keys.size.should == 2
+
+            validations["matches"].should  == "^[A|B|C]$"
+            validations["maxlength"].should == 1
+
+            validation_messages = grade_ctrl["validation_messages"]
+
+            validation_messages.should_not be_nil
+            validation_messages.keys.size.should == 2
+
+            validation_messages["matches"].should   == "must be A, B or C"
+            validation_messages["maxlength"].should == "must have 1 or less characters!"
+          end
+          true
+        end
+      end
+      
+      # TODO: check create file for controls
+
+      command "dump pwned"
+    end
   end
 end

data/spec/stackfu/commands/publish_command_spec.rb

@@ -123,6 +123,123 @@ describe StackFu::Commands::PublishCommand do
       command "pub"
       stdout.should =~ /missing name for control 1/
     end
+    
+    it "checks for misformatted validations" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', <<-EOS
+controls: 
+  - type: Textbox
+    name: myscript
+    validations: abcdef
+EOS
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid validations format for Textbox myscript/
+    end
+
+    it "checks for misformatted validations array" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', <<-EOS
+controls: 
+  - type: Textbox
+    name: myscript
+    validations: [abcdef, ghij]
+EOS
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+
+      command "pub"
+      stdout.should =~ /invalid validations format for Textbox myscript/
+    end
+
+    it "checks for unknown validation type" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', <<-EOS
+controls: 
+  - type: Textbox
+    name: myscript
+    validations:
+      popeye: olivia
+      charm: ok
+EOS
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+
+      command "pub"
+      stdout.should =~ /invalid validation type for Textbox myscript: popeye/
+      stdout.should =~ /invalid validation type for Textbox myscript: charm/
+    end
+
+    it "checks for missing options (Radio)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Radio, name: radio}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /missing options for Radio control radio/
+    end
+
+    it "checks for misformatted options (Radio)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Radio, name: radio, options: abcdef}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid options format for Radio control radio/
+    end
+    
+    it "checks for misformatted options (Radio)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Radio, name: radio, options: [one, two]}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid options format for Radio control radio/
+    end
+
+    it "checks for missing options (Combobox)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Combobox, name: combobox}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /missing options for Combobox control combobox/
+    end
+
+    it "checks for misformatted options (Combobox)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Combobox, name: combobox, options: abcdef}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid options format for Combobox control combobox/
+    end
+    
+    it "checks for misformatted options (Combobox)" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Combobox, name: combobox, options: [one, two]}]'
+      setup_one 'missing', 'config/02-requirements.yml', ''
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid options format for Combobox control combobox/
+    end
 
     it "checks for missing type" do
       setup_one 'missing', 'script.yml', '{name: myscript, type: script}'

data/stackfu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stackfu}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-14}
   s.default_executable = %q{stackfu}
   s.description = %q{StackFu Backend}
   s.email = %q{felipe@stackfu.com}
   s.executables = ["stackfu"]
   s.extra_rdoc_files = ["CHANGELOG", "README", "README.md", "bin/stackfu", "lib/stackfu.rb", "lib/stackfu/api_hooks.rb", "lib/stackfu/app.rb", "lib/stackfu/commands/command.rb", "lib/stackfu/commands/config_command.rb", "lib/stackfu/commands/deploy_command.rb", "lib/stackfu/commands/dump_command.rb", "lib/stackfu/commands/generate_command.rb", "lib/stackfu/commands/help_command.rb", "lib/stackfu/commands/list_command.rb", "lib/stackfu/commands/publish_command.rb", "lib/stackfu/commands/server_command.rb", "lib/stackfu/date_helper.rb", "lib/stackfu/helpers/providers_credentials.rb", "lib/stackfu/helpers/rendering.rb", "lib/stackfu/operating_systems.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README", "README.md", "Rakefile", "autotest/discover.rb", "bin/stackfu", "firewall/config/01-controls.yml", "firewall/config/02-requirements.yml", "firewall/config/03-executions.yml", "firewall/config/04-validations.yml", "firewall/executables/configure_ufw.sh.erb", "firewall/executables/install_ufw.sh.erb", "firewall/script.yml", "lib/stackfu.rb", "lib/stackfu/api_hooks.rb", "lib/stackfu/app.rb", "lib/stackfu/commands/command.rb", "lib/stackfu/commands/config_command.rb", "lib/stackfu/commands/deploy_command.rb", "lib/stackfu/commands/dump_command.rb", "lib/stackfu/commands/generate_command.rb", "lib/stackfu/commands/help_command.rb", "lib/stackfu/commands/list_command.rb", "lib/stackfu/commands/publish_command.rb", "lib/stackfu/commands/server_command.rb", "lib/stackfu/date_helper.rb", "lib/stackfu/helpers/providers_credentials.rb", "lib/stackfu/helpers/rendering.rb", "lib/stackfu/operating_systems.rb", "spec/fixtures/deployments/logs.json", "spec/fixtures/deployments/logs_end.json", "spec/fixtures/deployments/logs_failed.json", "spec/fixtures/deployments/logs_middle.json", "spec/fixtures/fcoury.json", "spec/fixtures/scripts/all.json", "spec/fixtures/scripts/create.json", "spec/fixtures/scripts/delete.json", "spec/fixtures/scripts/firewall.json", "spec/fixtures/scripts/firewall/deploy.json", "spec/fixtures/scripts/invalid/script.yml", "spec/fixtures/scripts/missing/config/01-controls.yml", "spec/fixtures/scripts/missing/config/02-requirements.yml", "spec/fixtures/scripts/missing/config/03-executions.yml", "spec/fixtures/scripts/missing/config/04-validations.yml", "spec/fixtures/scripts/missing/script.yml", "spec/fixtures/scripts/mongo.json", "spec/fixtures/scripts/mongo/deploy.json", "spec/fixtures/scripts/none.json", "spec/fixtures/scripts/not_found.json", "spec/fixtures/scripts/password.json", "spec/fixtures/scripts/script_not_found.json", "spec/fixtures/servers/all.json", "spec/fixtures/servers/cannot_deploy.json", "spec/fixtures/servers/no_ip.json", "spec/fixtures/servers/none.json", "spec/fixtures/servers/not_found.json", "spec/fixtures/servers/webbynode.json", "spec/fixtures/users/fcoury.json", "spec/fixtures/users/fcoury/mongodb.json", "spec/spec_helper.rb", "spec/stackfu/api_hooks_spec.rb", "spec/stackfu/commands/deploy_command_spec.rb", "spec/stackfu/commands/dump_command_spec.rb", "spec/stackfu/commands/generate_command_spec.rb", "spec/stackfu/commands/list_command_spec.rb", "spec/stackfu/commands/publish_command_spec.rb", "spec/stackfu/rendering_spec.rb", "stackfu-installer/config/01-controls.yml", "stackfu-installer/config/02-requirements.yml", "stackfu-installer/config/03-executions.yml", "stackfu-installer/config/04-validations.yml", "stackfu-installer/script/dotfiles_installation.sh.erb", "stackfu-installer/script/github_credentials_setup.sh.erb", "stackfu-installer/script/nginx_and_passenger.sh.erb", "stackfu-installer/script/redis_installation.sh.erb", "stackfu-installer/script/resque_installation.sh.erb", "stackfu-installer/script/ruby_environment.sh.erb", "stackfu-installer/script/stackfu.sh.erb", "stackfu-installer/stack.yml", "templates/01-controls.yml.erb", "templates/02-requirements.yml.erb", "templates/03-executions.yml.erb", "templates/04-validations.yml.erb", "templates/script.sh.erb", "templates/stack.yml.erb", "test/fixtures/add_server_error", "test/fixtures/deployment_add", "test/fixtures/deployment_add_error", "test/fixtures/deployments", "test/fixtures/logs", "test/fixtures/logs_partial", "test/fixtures/plugin_add", "test/fixtures/plugin_add_error", "test/fixtures/plugin_deployment_add", "test/fixtures/plugin_not_found", "test/fixtures/plugin_unauthorized", "test/fixtures/plugins", "test/fixtures/plugins_by_name", "test/fixtures/plugins_by_name_other", "test/fixtures/plugins_empty", "test/fixtures/plugins_multiple", "test/fixtures/providers", "test/fixtures/providers_servers", "test/fixtures/server_add", "test/fixtures/server_add_dupe", "test/fixtures/server_add_error", "test/fixtures/server_delete", "test/fixtures/server_delete_error", "test/fixtures/servers", "test/fixtures/servers_by_name", "test/fixtures/servers_empty", "test/fixtures/servers_not_found", "test/fixtures/servers_unauthorized", "test/fixtures/servers_webbynode", "test/fixtures/stack/stackfu-installer/config/01-controls.yml", "test/fixtures/stack/stackfu-installer/config/02-requirements.yml", "test/fixtures/stack/stackfu-installer/config/03-scripts.yml", "test/fixtures/stack/stackfu-installer/config/04-validations.yml", "test/fixtures/stack/stackfu-installer/script/dotfiles_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/github_credentials_setup.sh.erb", "test/fixtures/stack/stackfu-installer/script/nginx_and_passenger.sh.erb", "test/fixtures/stack/stackfu-installer/script/redis_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/resque_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/ruby_environment.sh.erb", "test/fixtures/stack/stackfu-installer/script/stackfu.sh.erb", "test/fixtures/stack/stackfu-installer/stack.yml", "test/fixtures/stack_add", "test/fixtures/stack_add_error", "test/fixtures/stack_add_error_dupe", "test/fixtures/stack_adds_by_name", "test/fixtures/stack_delete_not_found", "test/fixtures/stacks", "test/fixtures/stacks_by_name", "test/fixtures/stacks_by_name_other", "test/fixtures/stacks_empty", "test/fixtures/stacks_multiple", "test/fixtures/stacks_not_found", "test/fixtures/stacks_realworld", "test/fixtures/stacks_stackfu-installer", "test/fixtures/stacks_unauthorized", "test/fixtures/stacks_with_controls", "test/fixtures/users", "test/fixtures/users_no_credentials", "test/fixtures/users_update", "test/support/custom_matchers.rb", "test/support/fixtures.rb", "test/support/io_stub.rb", "test/support/web_fixtures.rb", "test/test_helper.rb", "test/unit/commands/test_command.rb", "test/unit/commands/test_config_command.rb", "test/unit/commands/test_deploy_command.rb", "test/unit/commands/test_dump_command.rb", "test/unit/commands/test_generate_command.rb", "test/unit/commands/test_help_command.rb", "test/unit/commands/test_list_command.rb", "test/unit/commands/test_publish_command.rb", "test/unit/commands/test_server_command.rb", "test/unit/helpers/test_rendering.rb", "test/unit/test_array.rb", "test/unit/test_provider.rb", "test/unit/test_stackfu.rb", "stackfu.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README", "README.md", "Rakefile", "autotest/discover.rb", "bin/stackfu", "lib/stackfu.rb", "lib/stackfu/api_hooks.rb", "lib/stackfu/app.rb", "lib/stackfu/commands/command.rb", "lib/stackfu/commands/config_command.rb", "lib/stackfu/commands/deploy_command.rb", "lib/stackfu/commands/dump_command.rb", "lib/stackfu/commands/generate_command.rb", "lib/stackfu/commands/help_command.rb", "lib/stackfu/commands/list_command.rb", "lib/stackfu/commands/publish_command.rb", "lib/stackfu/commands/server_command.rb", "lib/stackfu/date_helper.rb", "lib/stackfu/helpers/providers_credentials.rb", "lib/stackfu/helpers/rendering.rb", "lib/stackfu/operating_systems.rb", "spec/fixtures/deployments/logs.json", "spec/fixtures/deployments/logs_end.json", "spec/fixtures/deployments/logs_failed.json", "spec/fixtures/deployments/logs_middle.json", "spec/fixtures/fcoury.json", "spec/fixtures/scripts/all.json", "spec/fixtures/scripts/create.json", "spec/fixtures/scripts/delete.json", "spec/fixtures/scripts/firewall.json", "spec/fixtures/scripts/firewall/deploy.json", "spec/fixtures/scripts/invalid/script.yml", "spec/fixtures/scripts/missing/config/01-controls.yml", "spec/fixtures/scripts/missing/config/02-requirements.yml", "spec/fixtures/scripts/missing/config/03-executions.yml", "spec/fixtures/scripts/missing/config/04-validations.yml", "spec/fixtures/scripts/missing/script.yml", "spec/fixtures/scripts/mongo.json", "spec/fixtures/scripts/mongo/deploy.json", "spec/fixtures/scripts/none.json", "spec/fixtures/scripts/not_found.json", "spec/fixtures/scripts/password.json", "spec/fixtures/scripts/pwned.json", "spec/fixtures/scripts/pwned1.json", "spec/fixtures/scripts/script_not_found.json", "spec/fixtures/servers/all.json", "spec/fixtures/servers/cannot_deploy.json", "spec/fixtures/servers/no_ip.json", "spec/fixtures/servers/none.json", "spec/fixtures/servers/not_found.json", "spec/fixtures/servers/webbynode.json", "spec/fixtures/users/fcoury.json", "spec/fixtures/users/fcoury/mongodb.json", "spec/spec_helper.rb", "spec/stackfu/api_hooks_spec.rb", "spec/stackfu/commands/deploy_command_spec.rb", "spec/stackfu/commands/dump_command_spec.rb", "spec/stackfu/commands/generate_command_spec.rb", "spec/stackfu/commands/list_command_spec.rb", "spec/stackfu/commands/publish_command_spec.rb", "spec/stackfu/rendering_spec.rb", "stackfu-installer/config/01-controls.yml", "stackfu-installer/config/02-requirements.yml", "stackfu-installer/config/03-executions.yml", "stackfu-installer/config/04-validations.yml", "stackfu-installer/script/dotfiles_installation.sh.erb", "stackfu-installer/script/github_credentials_setup.sh.erb", "stackfu-installer/script/nginx_and_passenger.sh.erb", "stackfu-installer/script/redis_installation.sh.erb", "stackfu-installer/script/resque_installation.sh.erb", "stackfu-installer/script/ruby_environment.sh.erb", "stackfu-installer/script/stackfu.sh.erb", "stackfu-installer/stack.yml", "stackfu.gemspec", "templates/01-controls.yml.erb", "templates/02-requirements.yml.erb", "templates/03-executions.yml.erb", "templates/04-validations.yml.erb", "templates/script.sh.erb", "templates/stack.yml.erb", "test/fixtures/add_server_error", "test/fixtures/deployment_add", "test/fixtures/deployment_add_error", "test/fixtures/deployments", "test/fixtures/logs", "test/fixtures/logs_partial", "test/fixtures/plugin_add", "test/fixtures/plugin_add_error", "test/fixtures/plugin_deployment_add", "test/fixtures/plugin_not_found", "test/fixtures/plugin_unauthorized", "test/fixtures/plugins", "test/fixtures/plugins_by_name", "test/fixtures/plugins_by_name_other", "test/fixtures/plugins_empty", "test/fixtures/plugins_multiple", "test/fixtures/providers", "test/fixtures/providers_servers", "test/fixtures/server_add", "test/fixtures/server_add_dupe", "test/fixtures/server_add_error", "test/fixtures/server_delete", "test/fixtures/server_delete_error", "test/fixtures/servers", "test/fixtures/servers_by_name", "test/fixtures/servers_empty", "test/fixtures/servers_not_found", "test/fixtures/servers_unauthorized", "test/fixtures/servers_webbynode", "test/fixtures/stack/stackfu-installer/config/01-controls.yml", "test/fixtures/stack/stackfu-installer/config/02-requirements.yml", "test/fixtures/stack/stackfu-installer/config/03-scripts.yml", "test/fixtures/stack/stackfu-installer/config/04-validations.yml", "test/fixtures/stack/stackfu-installer/script/dotfiles_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/github_credentials_setup.sh.erb", "test/fixtures/stack/stackfu-installer/script/nginx_and_passenger.sh.erb", "test/fixtures/stack/stackfu-installer/script/redis_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/resque_installation.sh.erb", "test/fixtures/stack/stackfu-installer/script/ruby_environment.sh.erb", "test/fixtures/stack/stackfu-installer/script/stackfu.sh.erb", "test/fixtures/stack/stackfu-installer/stack.yml", "test/fixtures/stack_add", "test/fixtures/stack_add_error", "test/fixtures/stack_add_error_dupe", "test/fixtures/stack_adds_by_name", "test/fixtures/stack_delete_not_found", "test/fixtures/stacks", "test/fixtures/stacks_by_name", "test/fixtures/stacks_by_name_other", "test/fixtures/stacks_empty", "test/fixtures/stacks_multiple", "test/fixtures/stacks_not_found", "test/fixtures/stacks_realworld", "test/fixtures/stacks_stackfu-installer", "test/fixtures/stacks_unauthorized", "test/fixtures/stacks_with_controls", "test/fixtures/users", "test/fixtures/users_no_credentials", "test/fixtures/users_update", "test/support/custom_matchers.rb", "test/support/fixtures.rb", "test/support/io_stub.rb", "test/support/web_fixtures.rb", "test/test_helper.rb", "test/unit/commands/test_command.rb", "test/unit/commands/test_config_command.rb", "test/unit/commands/test_deploy_command.rb", "test/unit/commands/test_dump_command.rb", "test/unit/commands/test_generate_command.rb", "test/unit/commands/test_help_command.rb", "test/unit/commands/test_list_command.rb", "test/unit/commands/test_publish_command.rb", "test/unit/commands/test_server_command.rb", "test/unit/helpers/test_rendering.rb", "test/unit/test_array.rb", "test/unit/test_provider.rb", "test/unit/test_stackfu.rb"]
   s.homepage = %q{http://stackfu.com/cli}
   s.post_install_message = %q{
   --==-- StackFu - Server Deployment Engine --==--

data/templates/02-requirements.yml.erb

@@ -22,4 +22,5 @@
 # - type: FileExists
 #   data: "/etc/init.d/mysql"
 #
-requirements:
+# TODO: uncomment the following line to get started
+# requirements:

data/templates/04-validations.yml.erb

@@ -14,4 +14,5 @@
 # - type: DirExists
 #   data: "/etc/apache2"
 #
-validations:
+# TODO: uncomment the following line to get started
+# validations:

data/templates/stack.yml.erb

@@ -2,6 +2,7 @@
 type: script
 name: "<%= name %>"
 description: "Add your description here"
+tags: ['tag1', 'tag2']
 #
 # TODO: Before submitting this script, double check the
 # attributes above.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stackfu
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Felipe Coury
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -03:00
+date: 2010-10-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,13 +133,6 @@ files:
 - Rakefile
 - autotest/discover.rb
 - bin/stackfu
-- firewall/config/01-controls.yml
-- firewall/config/02-requirements.yml
-- firewall/config/03-executions.yml
-- firewall/config/04-validations.yml
-- firewall/executables/configure_ufw.sh.erb
-- firewall/executables/install_ufw.sh.erb
-- firewall/script.yml
 - lib/stackfu.rb
 - lib/stackfu/api_hooks.rb
 - lib/stackfu/app.rb
@@ -177,6 +170,8 @@ files:
 - spec/fixtures/scripts/none.json
 - spec/fixtures/scripts/not_found.json
 - spec/fixtures/scripts/password.json
+- spec/fixtures/scripts/pwned.json
+- spec/fixtures/scripts/pwned1.json
 - spec/fixtures/scripts/script_not_found.json
 - spec/fixtures/servers/all.json
 - spec/fixtures/servers/cannot_deploy.json
@@ -206,6 +201,7 @@ files:
 - stackfu-installer/script/ruby_environment.sh.erb
 - stackfu-installer/script/stackfu.sh.erb
 - stackfu-installer/stack.yml
+- stackfu.gemspec
 - templates/01-controls.yml.erb
 - templates/02-requirements.yml.erb
 - templates/03-executions.yml.erb
@@ -289,7 +285,6 @@ files:
 - test/unit/test_array.rb
 - test/unit/test_provider.rb
 - test/unit/test_stackfu.rb
-- stackfu.gemspec
 has_rdoc: true
 homepage: http://stackfu.com/cli
 licenses: []

data/firewall/config/01-controls.yml

@@ -1,5 +0,0 @@
---- 
-controls: 
-- label: Ports
-  name: Ports
-  type: Textbox

data/firewall/config/02-requirements.yml

@@ -1,4 +0,0 @@
---- 
-requirements: 
-- data: apt-get
-  type: ExecutableExists

data/firewall/config/03-executions.yml

@@ -1,6 +0,0 @@
---- 
-executions: 
-- file: install_ufw
-  description: Install Ufw
-- file: configure_ufw
-  description: Configure Ufw

data/firewall/config/04-validations.yml

@@ -1,4 +0,0 @@
---- 
-validations: 
-- data: ufw
-  type: ExecutableExists

data/firewall/executables/configure_ufw.sh.erb

@@ -1,9 +0,0 @@
-      # 
-      # install_ufw.sh
-      # Tue Dec 01 15:06:48 -0200 2009
-      #
-
-      ufw default deny
-      <% ports.split(",").each do |port| %>
-        ufw allow <%= port %> 
-      <% end %>

data/firewall/executables/install_ufw.sh.erb

@@ -1,7 +0,0 @@
-      # 
-      # configure_ufw.sh
-      # Tue Dec 01 15:06:48 -0200 2009
-      #
-
-      apt-get update
-      apt-get install -y ufw

data/firewall/script.yml

@@ -1,8 +0,0 @@
---- 
-name: firewall
-type: script
-description: |-
-  Set up a firewall for your server to improve security.
-    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-    Praesent eget erat libero, id malesuada tortor.
-    Donec pharetra sapien et nulla ultricies ac pharetra neque vulputate.