stackfu 0.1.5 → 0.1.6

data/Rakefile

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

data/lib/stackfu/commands/deploy_command.rb

@@ -18,21 +18,27 @@ module StackFu::Commands
     
     def extract_settings(target)
       target_name = parameters[0]
-      server_name = parameters[1]      
+      server_name = parameters[1]
       
-      target_class = StackFu::ApiHooks.const_get(target.capitalize)
-      begin
-        target = target_class.find(target_name)
-      rescue ActiveResource::ResourceNotFound
-        error "#{target.capitalize} '#{target_name}' was not found"
-        return
-      end
+      if target_name.include?('/')
+        user_name, target_name = target_name.split('/')
+        user = User.new(:id => user_name)
+        target = Script.new(user.get(target_name))
+      else
+        begin
+          target_class = StackFu::ApiHooks.const_get(target.capitalize)
+          target = target_class.find(target_name)
+        rescue ActiveResource::ResourceNotFound
+          error "#{target.capitalize} '#{target_name}' was not found"
+          return
+        end
 
-      begin
-        target = target_class.find(target_name)
-      rescue ActiveResource::ResourceNotFound
-        error "#{target.capitalize} '#{target_name}' was not found"
-        return
+        begin
+          target = target_class.find(target_name)
+        rescue ActiveResource::ResourceNotFound
+          error "#{target.capitalize} '#{target_name}' was not found"
+          return
+        end
       end
 
       unless target

data/lib/stackfu/commands/dump_command.rb

@@ -82,9 +82,9 @@ module StackFu::Commands
           create_file "#{script_name}/executables/#{script.description.downcase.gsub(" ", "_")}.sh.erb", script.body
         end
         
-        puts "Script #{script_name} dumped successfully..."
+        done "Script #{script_name} dumped."
       else
-        puts "Script '#{script_name}' was not found"
+        error "Script '#{script_name}' was not found"
       end
     end
     
@@ -99,7 +99,7 @@ module StackFu::Commands
     end
     
     def create_folder(folder)
-      puts "\tcreate  #{folder}/"
+      puts "\t#{"create".foreground(:green)}  #{folder}/"
       mkdir folder
     end
     
@@ -110,7 +110,7 @@ module StackFu::Commands
     end
     
     def create_file(file, contents)
-      puts "\tcreate  #{file}"
+      puts "\t#{"create".foreground(:green)}  #{file}"
       write_file(file, contents)
     end
     

data/lib/stackfu/commands/generate_command.rb

@@ -31,6 +31,14 @@ module StackFu::Commands
       what = 'script'
       begin
         item_name = parameters.shift
+
+        unless item_name
+          error "Missing script name.",
+            "Try again using 'stackfu generate [script_name]'."
+          return false
+        end
+        
+        
         items = {}
         while (p = parameters.shift)
           name, type = p.split(":")
@@ -72,11 +80,11 @@ module StackFu::Commands
           create("#{item_name}/executables", "#{item.first}.sh.erb", item.last)
         end or create("#{item_name}/executables")
       
-        puts "#{what.titleize} #{item_name} created successfully"
+        done "#{what.titleize} #{item_name} created successfully"
       rescue Exceptions::InvalidParameter
-        puts $!.message
+        error $!.message
       rescue IOError, Errno::EEXIST
-        puts "There was an error creating your #{what}: #{$!.message}"      
+        error "#{$!.message}"      
       end
     end
   
@@ -89,13 +97,13 @@ module StackFu::Commands
   
     def create(d, f=nil, contents=nil)
       unless File.directory?(d)
-        puts "\tcreate  #{d}/"
+        puts "\t#{"create".foreground(:green)}  #{d}/"
         ::FileUtils.mkdir_p(d)
       end
 
       if f.present?
         f = "#{d}/#{f}"
-        puts "\tcreate  #{f}"
+        puts "\t#{"create".foreground(:green)}  #{f}"
         File.open(f, "w") do |file|
           file.write(contents)
         end

data/lib/stackfu/commands/help_command.rb

@@ -3,22 +3,22 @@ module StackFu::Commands
     def default(parameters, options)
       stackfu = "stackfu".foreground(:green).bright
     
-      puts "#{"StackFu #{StackFu::VERSION}".foreground(:green).bright}, a server deployment manager."
-      puts " (c) 2009-2020 StackFu - http://stackfu.com"
+      puts "#{"StackFu #{StackFu::VERSION}".foreground(:green).bright} - social server provisioning."
+      puts " (c) 2010-2020 StackFu - http://stackfu.com"
       puts ""
       puts "  Usage:"
       puts "    #{stackfu} #{"command".foreground(:cyan)} [arguments...] [options...]"
       puts ""
       puts "  Examples:"
-      puts "    #{stackfu} #{"generate".foreground(:cyan)} stack lamp"
+      puts "    #{stackfu} #{"generate".foreground(:cyan)} lamp"
       puts "    #{stackfu} #{"pub".foreground(:cyan)}"
       puts "    #{stackfu} #{"deploy".foreground(:cyan)} lamp server1"
       puts ""
       puts "  Commands:"
       puts "    #{"help".foreground(:cyan)}                         you already know about this one, dontcha?"
       puts "    #{"config".foreground(:cyan)}                       configure StackFu CLI options"
-      puts "    #{"server".foreground(:cyan)}                       create, delete, update and deploy to StackFu servers"
-      puts "    #{"generate".foreground(:cyan)} [stack|plugin]      creates a new stack or plugin in current_dir/name"
+      puts "    #{"list".foreground(:cyan)} [servers|script]        lists all the scripts and/or server under your account"
+      puts "    #{"generate".foreground(:cyan)}                     creates a new script in current_dir/name"
       puts "    #{"publish".foreground(:cyan)}                      publishes the item on the current folder to StackFu.com"
       puts "" 
       puts "  For a complete guide on using StackFu from command line:"

data/lib/stackfu/commands/publish_command.rb

@@ -10,6 +10,19 @@ module StackFu::Commands
     def plugin?
       File.exists?("plugin.yml")
     end
+    
+    def format_error
+      messages = ["there were validation problems with your script.", ""]
+      %w(script.yml config/01-controls.yml config/02-requirements.yml config/03-executions.yml config/04-validations.yml).each do |f|
+        if @errors[f]
+          messages << "Errors in #{f.foreground(:green)}:"
+          messages << @errors[f].map { |e| "- #{e}" }
+          messages << ""
+        end
+      end
+      
+      messages.flatten.join("\n")
+    end
 
     def default(parameters, options)
       what = :script
@@ -20,7 +33,12 @@ module StackFu::Commands
       end
       
       begin
-        stack_spec = YAML.load(read("#{what}.yml"))
+        stack_spec = read_and_validate(what)
+        
+        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"))
@@ -111,7 +129,99 @@ module StackFu::Commands
     end
   
     private
+    
+    def check(file, message)
+      return true if result = block_given? ? yield : false
+      
+      (@errors[file]||=[]) << message.gsub(/'(.*)'/, '\1'.foreground(:blue).bright)
+      false
+    end
+    
+    def read_and_check(yml)
+      begin
+        return YAML.load(read(yml))
+      rescue ArgumentError
+        (@errors[yml]||=[]) << "invalid YAML document. Parse error: #{$!.message}" 
+      end
+    end
+    
+    def read_and_validate(what)
+      @errors = {}
+      
+      if stack_spec = read_and_check("#{what}.yml")
+        if check("script.yml", "the file descriptor has the wrong format") { stack_spec.is_a?(Hash) }
+          if check("script.yml", "missing field #{"name".try(:foreground, :blue).try(:bright)}")             { stack_spec['name'] }
+            check("script.yml", 
+              "invalid value for field #{"name".try(:foreground, :blue).try(:bright)}: " +
+              "only lower case chars, numbers and underscores are allowed") { 
+                
+                stack_spec['name'] =~ /^[a-z0-9_]*$/
+            }
+          end
+          
+          if check("script.yml", "missing field #{"type".try(:foreground, :blue).try(:bright)}")          { stack_spec['type'] }    
+            check("script.yml", "invalid value for field #{"type".try(:foreground, :blue).try(:bright)}") { stack_spec['type'] == 'script' }
+          end
+        end
+      end
+
+      validate_controls
+      validate_requirements
+      validate_executions
+      validate_validations
+      
+      stack_spec
+    end
+    
+    def validate_spec(idx, name, item_id, checks)
+      file = "config/#{idx}-#{name}.yml"
+      
+      return unless spec = read_and_check(file)
+      return unless check(file, "invalid format") { 
+        spec.is_a?(Hash) && spec[name].is_a?(Array) 
+      }
+      
+      spec[name].each_with_index do |item, i|
+        checks.each do |check|
+          if item_id.nil? or check == item_id
+            check(file, "missing #{check} for #{name.singularize} #{i+1}") { item[check] }
+          else
+            check(file, "missing #{check} for #{name.singularize} #{item[item_id].try(:foreground, :blue).try(:bright)}") { item[check] }
+          end
+        end
+        
+        return unless yield(item, i+1) if block_given?
+      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']
+        }
+      end
+    end
+    
+    def validate_requirements
+      validate_spec '02', 'requirements', nil, ['type', 'data'] do |item, i|
+        check("config/02-requirements.yml", "invalid type #{item["type"].try(:foreground, :blue).try(:bright)} for requirement #{i}") { 
+          %w(DirExists FileExists ExecutableExists ProcessExists RubyCanLoad RubyGem SymlinkExists).include? item['type']
+        }
+      end
+    end
   
+    def validate_executions
+      validate_spec '03', 'executions', 'file', ['file', 'description']
+    end
+    
+    def validate_validations
+      validate_spec '04', 'validations', nil, ['type', 'data'] do |item, i|
+        check('config/04-validations.yml', "invalid type #{item["type"].try(:foreground, :blue).try(:bright)} for validation #{i}") { 
+          %w(DirExists FileExists ExecutableExists ProcessExists RubyCanLoad RubyGem SymlinkExists).include? item['type']
+        }
+      end
+    end
+        
     def publish(stack)
       spinner {
         stack.save

data/lib/stackfu.rb

@@ -50,7 +50,7 @@ require "#{dir}/commands/deploy_command"
 require "#{dir}/commands/dump_command"
 
 module StackFu
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   API = "http://beta.stackfu.com"
   # API = "http://localhost:3000"
   CONFIG_FILE = "#{ENV['HOME']}/.stackfu"

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ HighLine.track_eof = false
 # Reads out a file from the fixtures directory
 
 module StackFuHelpers
+  def fixture?(file)
+    File.exists?(File.join(File.dirname(__FILE__), "fixtures", file))
+  end
+  
   def read_fixture(file)
     File.read(File.join(File.dirname(__FILE__), "fixtures", file))
   end

data/spec/stackfu/commands/deploy_command_spec.rb

@@ -17,6 +17,21 @@ describe StackFu::Commands::DeployCommand do
       stdout.should =~ /Aborted./
     end
   end
+  
+  context "deploying other user's scripts" do
+    it "queries for /user/script.json" do
+      prepare(:get, '/users/fcoury/mongodb.json')
+      prepare(:get, '/servers/webbynode.json')
+      
+      when_asked "  Ports: ", :answer => "80,23,22"
+
+      disagree_of "Continue with script installation?\n"
+
+      command "dep fcoury/mongodb webbynode"
+
+      stdout.should =~ /Aborted./
+    end
+  end
     
   context 'rendering controls do' do
     it "tells the user if there is another deployment running" do

data/spec/stackfu/commands/dump_command_spec.rb

@@ -41,7 +41,7 @@ describe StackFu::Commands::DumpCommand do
       stdout.should =~ /^\tcreate  firewall\/executables\//
       stdout.should =~ /^\tcreate  firewall\/executables\/install_ufw.sh.erb/
       stdout.should =~ /^\tcreate  firewall\/executables\/configure_ufw.sh.erb/
-      stdout.should =~ /^Script firewall dumped successfully/
+      stdout.should =~ /^Success: Script firewall dumped/
     end
   end
 end

data/spec/stackfu/commands/generate_command_spec.rb

@@ -2,6 +2,11 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
 
 describe StackFu::Commands::GenerateCommand do
+  it "shown an error if no name is given" do
+    command "generate"
+    stdout.should =~ /Missing script name./
+  end
+  
   it "generates the script file and folder when no executables are given" do
     expect_create :dir => "test", :file => "script.yml"
     expect_create :dir => "test/executables"
@@ -65,13 +70,13 @@ describe StackFu::Commands::GenerateCommand do
   it "raises a nice error when mkdir fails" do
     expect_create :dir => "test", :file => "script.yml", :raise => [IOError, "Error description"]
     command "generate test"
-    stdout.should =~ /There was an error creating your script: Error description/
+    stdout.should =~ /Error description/
   end
 
   it "raises a nice error when mkdir fails because there is a file with same name" do
     expect_create :dir => "test", :file => "script.yml", :raise => [Errno::EEXIST, "Error description"]
     command "generate test"
-    stdout.should =~ /There was an error creating your script: File exists - Error description/
+    stdout.should =~ /File exists - Error description/
   end
 
   def expect_create(opts={})

data/spec/stackfu/commands/publish_command_spec.rb

@@ -2,6 +2,278 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
 
 describe StackFu::Commands::PublishCommand do
+
+  context 'validating script.yml' do
+    it "validates the name for invalid chars" do
+      setup_one 'missing', 'script.yml', "name: My Fair Scripty\ntype: script"
+      setup_one 'missing', 'config/01-controls.yml', ''
+      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 value for field name: only lower case chars, numbers and underscores are allowed/
+    end
+
+    
+    it "checks script.yml format" do
+      setup_fixture('invalid')
+      setup_one 'missing', 'config/01-controls.yml', ''
+      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 =~ /the file descriptor has the wrong format/
+    end
+
+    it "checks for valid YAML file" do
+      setup_one 'missing', 'script.yml', 'name: myscript, type: yadda'
+      setup_one 'missing', 'config/01-controls.yml', ''
+      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 YAML document. Parse error: syntax error on line 0, col 21/
+    end
+
+    it "checks required script field 'name'" do
+      setup_fixture('missing')
+
+      command "pub"
+      stdout.should =~ /missing field name/
+    end
+
+    it "checks required script field 'type'" do
+      setup_one 'missing', 'script.yml', 'name: myscript'
+      setup_one 'missing', 'config/01-controls.yml', ''
+      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 field type/
+    end
+
+    it "checks content of field 'type'" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: yadda}'
+      setup_one 'missing', 'config/01-controls.yml', ''
+      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 value for field type/
+    end
+  end
+  
+  context 'validating 01-controls.yml' do
+    it "checks file format" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'hey you'
+      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 format/
+    end
+
+    it "checks for invalid YML" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'name: myscript, type: yadda'
+      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 YAML document. Parse error: syntax error on line 0, col 21/
+    end
+    
+    it "checks for missing controls key" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'other: [{name: control}]'
+      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 format/
+    end
+
+    it "assures that controls is an array" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'other: {name: control}'
+      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 format/
+    end
+
+    it "checks for missing name" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{type: Textbox}]'
+      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 name for control 1/
+    end
+
+    it "checks for missing type" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{name: control}]'
+      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 type for control control/
+    end
+
+    it "checks for invalid type" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: [{name: control, type: RockOn}]'
+      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 type RockOn for control control/
+    end
+  end
+  
+  context 'validating 02-requirements.yml' do
+    it "checks file format" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'hey you'
+      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 format/
+    end
+    
+    it "checks for invalid YAML" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'name: myscript, - type: yadda'
+      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 YAML document. Parse error: syntax error on line 0, col 23/
+    end
+    
+    it "checks for missing type" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', "requirements:\n- {data: x, type: DirExists}\n- data: x"
+      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 type for requirement 2/
+    end
+  end
+  
+  context 'validating 03-executions.yml' do
+    it "checks file format" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', 'hey you'
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid format/
+    end
+    
+    it "checks for invalid YAML" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', 'name: myscript, - type: yadda'
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /invalid YAML document. Parse error: syntax error on line 0, col 23/
+    end
+    
+    it "checks for missing description" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}\n- file: execution"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /missing description for execution execution/
+    end
+    
+    it "checks for missing file" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', ''
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}\n- description: execution"
+      setup_one 'missing', 'config/04-validations.yml', ''
+      
+      command "pub"
+      stdout.should =~ /missing file for execution 2/
+    end
+  end
+  
+  context 'validating 04-validations.yml' do
+    it "checks file format" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      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', 'hey you'
+      
+      command "pub"
+      stdout.should =~ /invalid format/
+    end
+    
+    it "checks for invalid YAML" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', "executions:\n- {file: x, description: y}"
+      setup_one 'missing', 'config/04-validations.yml', 'name: myscript, - type: yadda'
+      
+      command "pub"
+      stdout.should =~ /invalid YAML document. Parse error: syntax error on line 0, col 23/
+    end
+    
+    it "checks for missing type" do
+      setup_one 'missing', 'script.yml', '{name: myscript, type: script}'
+      setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+      setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+      setup_one 'missing', 'config/03-executions.yml', ""
+      setup_one 'missing', 'config/04-validations.yml', "validations:\n- {data: x, type: DirExists}\n- data: x"
+      
+      command "pub"
+      stdout.should =~ /missing type for validation 2/
+    end
+  end
+  
+  it "reports all errors" do
+    setup_one 'missing', 'script.yml', '{name: myscript}'
+    setup_one 'missing', 'config/01-controls.yml', 'controls: []'
+    setup_one 'missing', 'config/02-requirements.yml', 'requirements: []'
+    setup_one 'missing', 'config/03-executions.yml', ""
+    setup_one 'missing', 'config/04-validations.yml', "validations:\n- {data: x, type: DirExists}\n- data: x"
+    
+    command "pub"
+    stdout.should =~ /missing field type/
+    stdout.should =~ /missing type for validation 2/
+  end
   
   it "checks if script exists before publishing" do
     prepare(:get, '/scripts/firewall.json', '/scripts/firewall.json')
@@ -17,14 +289,32 @@ describe StackFu::Commands::PublishCommand do
     stdout.should =~ /Success/
   end
   
+  private
+  
+  def setup_fixture(script)
+    setup_one script, "script.yml"  
+    setup_one script, "config/01-controls.yml"
+    setup_one script, "config/02-requirements.yml"
+    setup_one script, "config/03-executions.yml"
+    setup_one script, "config/04-validations.yml"
+  end
+  
+  def setup_one(script, expect, contents=nil)
+    return unless fixture?("scripts/#{script}/#{expect}")
+    contents ||= read_fixture("scripts/#{script}/#{expect}")
+      
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with(expect).returns(contents)
+  end
+  
+  
   def setup_script(options={})
-    StackFu::Commands::PublishCommand.any_instance.expects(:read).with("script.yml").returns(<<-EOS)
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("script.yml").returns(<<-EOS)
 --- 
-type: stack
+type: script
 name: #{options[:"script_name"] || "my_script"}
 description: "This will deploy my script"
 EOS
-    StackFu::Commands::PublishCommand.any_instance.expects(:read).with("config/01-controls.yml").returns(<<-EOS)
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("config/01-controls.yml").returns(<<-EOS)
 controls:
 - name: nome
   label: Nome
@@ -33,28 +323,28 @@ controls:
   label: Idade
   type: Numericbox
 EOS
-    StackFu::Commands::PublishCommand.any_instance.expects(:read).with("config/02-requirements.yml").returns(<<-EOS)
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("config/02-requirements.yml").returns(<<-EOS)
 requirements:
 
-- type: directory
+- type: DirExists
   data: "/var"
   error: "You need /var folder before installing"
 EOS
-    StackFu::Commands::PublishCommand.any_instance.expects(:read).with("config/03-executions.yml").returns(options[:scripts] || <<-EOS)
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("config/03-executions.yml").returns(options[:scripts] || <<-EOS)
 executions: 
 
 - description: Echoer
   file: echoer
 EOS
-    StackFu::Commands::PublishCommand.any_instance.expects(:read).with("config/04-validations.yml").returns(<<-EOS)
+    StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("config/04-validations.yml").returns(<<-EOS)
 validations:
-- type: directory
+- type: DirExists
   data: "/etc/apache2"
   error: Apache was not installed properly
 EOS
 
     unless options[:scripts]
-      StackFu::Commands::PublishCommand.any_instance.expects(:read).with("executables/echoer.sh.erb").returns(<<-EOS)
+      StackFu::Commands::PublishCommand.any_instance.stubs(:read).with("executables/echoer.sh.erb").returns(<<-EOS)
 #
 # echoe.sh
 # Echoes a variable

data/stackfu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stackfu}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-16}
   s.default_executable = %q{stackfu}
   s.description = %q{StackFu Backend}
   s.email = %q{felipe@stackfu.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stackfu
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Felipe Coury
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2010-09-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency