stackfu 0.1.1 → 0.1.2.1

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+gem 'webmock', '~>1.3.4'
+gem 'rspec',   '2.0.0.beta.19'

data/Manifest

@@ -1,9 +1,21 @@
 CHANGELOG
+Gemfile
 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/03-scripts.yml
+firewall/config/04-validations.yml
+firewall/executables/configure_ufw.sh.erb
+firewall/executables/install_ufw.sh.erb
+firewall/script.yml
+firewall/script/configure_ufw.sh.erb
+firewall/script/install_ufw.sh.erb
 lib/stackfu.rb
 lib/stackfu/api_hooks.rb
 lib/stackfu/app.rb
@@ -16,12 +28,34 @@ 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/scripts/all.json
+spec/fixtures/scripts/create.json
+spec/fixtures/scripts/delete.json
+spec/fixtures/scripts/firewall.json
+spec/fixtures/scripts/none.json
+spec/fixtures/scripts/not_found.json
+spec/fixtures/scripts/script_not_found.json
+spec/fixtures/servers/all.json
+spec/fixtures/servers/cannot_deploy.json
+spec/fixtures/servers/deploy.json
+spec/fixtures/servers/none.json
+spec/fixtures/servers/not_found.json
+spec/fixtures/servers/webbynode.json
+spec/fixtures/servers/webbynode/deploy.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
 stackfu-installer/config/01-controls.yml
 stackfu-installer/config/02-requirements.yml
-stackfu-installer/config/03-scripts.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
@@ -31,10 +65,9 @@ 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-scripts.yml.erb
+templates/03-executions.yml.erb
 templates/04-validations.yml.erb
 templates/script.sh.erb
 templates/stack.yml.erb
@@ -97,7 +130,6 @@ test/fixtures/stacks_with_controls
 test/fixtures/users
 test/fixtures/users_no_credentials
 test/fixtures/users_update
-test/stack.yml
 test/support/custom_matchers.rb
 test/support/fixtures.rb
 test/support/io_stub.rb

data/Rakefile

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

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/firewall/config/01-controls.yml

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

data/firewall/config/02-requirements.yml

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

data/firewall/config/03-executions.yml

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

data/firewall/config/03-scripts.yml

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

data/firewall/config/04-validations.yml

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

data/firewall/executables/configure_ufw.sh.erb

@@ -0,0 +1,9 @@
+      # 
+      # 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

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

data/firewall/script/configure_ufw.sh.erb

@@ -0,0 +1,9 @@
+      # 
+      # 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/script/install_ufw.sh.erb

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

data/firewall/script.yml

@@ -0,0 +1,8 @@
+--- 
+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.

data/lib/stackfu/api_hooks.rb

@@ -7,12 +7,12 @@ module StackFu
     class Server < Resource; end
     class User < Resource; end
     class Stack < Resource; end
-    class Plugin < Resource; end
+    class Script < Resource; end
     class Provider < Resource; end
     class Deployment < Resource; end
   
     def initialize_api(config)
-      [Server, User, Stack, Plugin, Provider, Deployment].each do |model_class|
+      [Server, User, Stack, Script, Provider, Deployment].each do |model_class|
         model_class.user = $config[:token]
         model_class.password = "X"
         model_class.site = StackFu::API

data/lib/stackfu/app.rb

@@ -19,7 +19,7 @@ module StackFu
     def execute
       begin
         command = @args.delete_at(0)
-        cmd = Command.create(command, @args)
+        cmd = Commands::Command.create(command, @args)
         cmd.run
       rescue Errno::ECONNREFUSED
         error "Could not connect to StackFu server.",
@@ -36,13 +36,13 @@ module StackFu
           "Please report this problem at support@stackfu.com or try again in a few minutes."
         raise if $dev
 
-      rescue Exceptions::UnknownCommand
+      rescue Commands::Exceptions::UnknownCommand
         error "Command #{command} does not exist", "Try using 'stackfu help' for a summary of available commands."
         
-      rescue Exceptions::InvalidCommand
+      rescue Commands::Exceptions::InvalidCommand
         error "Command #{command} is invalid", $!.message
         
-      rescue Exceptions::InvalidSubcommand
+      rescue Commands::Exceptions::InvalidSubcommand
         error "Invalid usage for command #{command}", $!.message
       end
     end
@@ -54,7 +54,7 @@ module StackFu
       puts ""
       puts "To get you up to speed, we need you to provide us a couple of configuration settings that will follow."
       puts
-      ConfigCommand.new.run
+      Commands::ConfigCommand.new.run
       true
     end
   

data/lib/stackfu/commands/command.rb

@@ -1,4 +1,4 @@
-module StackFu
+module StackFu::Commands
   class Command
     include StackFu::OperatingSystems
     include StackFu::Rendering
@@ -15,7 +15,7 @@ module StackFu
       end
       
       def command_for(command)
-        StackFu.const_get("#{command.camelize}Command")
+        StackFu::Commands.const_get("#{command.camelize}Command")
       rescue NameError
         raise Exceptions::UnknownCommand
       end
@@ -97,7 +97,10 @@ module StackFu
     end
   
     def parse_options(args)
-      @subcommand = args.pop unless args.last =~ /^-(.*)/
+      if self.class.subcommand_options and !self.class.subcommand_options.empty?
+        @subcommand = args.pop unless args.last =~ /^-(.*)/
+      end
+      
       @subcommand ||=  "default"
       @parameters = []
       @options = {}
@@ -121,6 +124,7 @@ module StackFu
         end
       end
 
+
       @subcommand = self.class.send(:resolve, @subcommand)
     end
   end

data/lib/stackfu/commands/config_command.rb

@@ -1,4 +1,4 @@
-module StackFu
+module StackFu::Commands
   class ConfigCommand < Command
     include StackFu::ApiHooks
     include StackFu::ProvidersCredentials

data/lib/stackfu/commands/deploy_command.rb

@@ -1,27 +1,17 @@
-module StackFu
+module StackFu::Commands
   class DeployCommand < Command
-    include ApiHooks
+    include StackFu::ApiHooks
   
-    error_messages :missing_subcommand => "You have to tell what you want to deploy (a stack or a plugin) and to which server."
+    # error_messages :missing_subcommand => "You have to tell what you want to deploy and to which server."
+    # subcommand :script, :required_parameters => [:plugin_name, :server]
 
-    subcommand :plugin, :required_parameters => [:plugin_name, :server]
-    subcommand :stack,  :required_parameters => [:stack_name, :server]
-
-    def plugin(parameters, options)
-      execute "plugin", parameters, options, false do |target|
+    def default(parameters, options)
+      execute "script", parameters, options, false do |target|
         puts "*** Preparing: #{target.name.foreground(:yellow).bright}"
         puts "    #{target.description}"
         puts ""
       end
     end
-    
-    def stack(parameters, options)
-      execute "stack", parameters, options, true do |target|
-        puts "*** Deploying: #{target.name.foreground(:yellow).bright} (based on #{os_name(target.operating_system.to_sym).foreground(:yellow)})"
-        puts "    #{target.description}"
-        puts ""
-      end
-    end
 
     private
     
@@ -30,26 +20,44 @@ module StackFu
       server_name = parameters[1]      
       
       target_class = StackFu::ApiHooks.const_get(target.capitalize)
-      
-      targets = target_class.find(:all, :params => { target.to_sym => { :name => target_name } })
-      unless targets.any?
+      begin
+        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
+      end
+
+      unless target
         error "#{target.capitalize} '#{target_name}' was not found"
         return
       end
       
-      server = Server.find(:all, :params => { :server => { :hostname => server_name } })
-      unless server.any?
-        error "Server '#{server_name}' was not found.",
-          "You can add servers 'stackfu server add' or list your current servers with 'stackfu servers'."
+      begin
+        server = Server.find(server_name)
+      rescue ActiveResource::ResourceNotFound
+        error "Server '#{server_name}' was not found"
         return
       end
       
-      return targets.first, server
+      return target, server
     end
     
     def execute(target_name, parameters, options, stack)
+      if parameters.size < 2
+        puts "You have to tell which script you want to deploy and to which server."
+        puts "Usage: stackfu deploy [script] [server]"
+        return
+      end
+      
       target, server = extract_settings(target_name)
-      return unless target
+      return unless target and server
       
       yield target
       
@@ -78,31 +86,15 @@ module StackFu
         puts ""
       end
     
-      continue = if stack
-        warning "This will destroy current contents of your server. Are you sure?\n"
-      else
-        agree "Continue with plugin installation?\n"
-      end
-      
-      unless continue
+      unless agree "Continue with script installation?\n"
         puts "Aborted."
         return false
       end
-    
-      item = target if stack
-      hash = { :stack => item, :server_id => server.first.id, :params => params }
-      
-      unless stack
-        hash[:plugin_ids] = [target.id]
-      end
       
-      deployment = Deployment.new(hash)
+      server_id = server.id
+      server.id = server.slug
+      deployment = server.post(:deploy, {}, { :id => server_id, :script_id => target.slug, :params => params }.to_json)
       
-      unless deployment.save
-        error "There was a problem submitting your deployment: #{deployment.errors.full_messages.to_s}"
-        return
-      end
-    
       if options[:"no-follow"]
         puts "Your deployment have been submitted"
         return 
@@ -110,22 +102,22 @@ module StackFu
     
       verbose = options[:verbose]
     
-      from = nil
-      while true
-        opts = {:formatted => "true", :from => from}
-        opts.merge!(:verbose => "true") if verbose
-
-        status = spinner {
-          Deployment.find(deployment.id).get(:logs, opts)
-        }
-      
-        if status["id"]
-          show_log status["log"]
-          from = status["id"] 
-        end
-
-        break if status["state"] == "finished" or status["state"] == "failed"
-      end
+      # from = nil
+      # while true
+      #   opts = {:formatted => "true", :from => from}
+      #   opts.merge!(:verbose => "true") if verbose
+      # 
+      #   status = spinner {
+      #     Deployment.find(deployment.id).get(:logs, opts)
+      #   }
+      # 
+      #   if status["id"]
+      #     show_log status["log"]
+      #     from = status["id"] 
+      #   end
+      # 
+      #   break if status["state"] == "finished" or status["state"] == "failed"
+      # end
       
     end
   

data/lib/stackfu/commands/dump_command.rb

@@ -1,33 +1,41 @@
-module StackFu
+module StackFu::Commands
   class DumpCommand < Command
-    include ApiHooks
+    include StackFu::ApiHooks
 
-    error_messages :missing_subcommand => "You have to tell what you want to dump: a stack or a plugin"
-    subcommand :plugin, :required_parameters => [:plugin_name]
-    
-    def plugin(parameters, options)
-      stack_name = parameters[0]
-      stack = spinner { Plugin.find(stack_name) }
+    def default(parameters, options)
+      script_name = parameters[0]
+      
+      unless script_name
+        puts "You have to tell which script you want to dump."
+        return
+      end
+      
+      script = spinner { 
+        begin
+          Script.find(script_name) 
+        rescue ActiveResource::ResourceNotFound 
+        end
+      }
       
-      if stack
-        if directory?(stack_name) 
-          unless agree("There is already a folder called '#{stack_name}'. Do you want to overwrite its contents?")
+      if script
+        if directory?(script_name) 
+          unless agree("There is already a folder called '#{script_name}'. Do you want to overwrite its contents?")
             puts "Aborted."
             return false
           end
         end
         
-        create_folder(stack_name)
-        create_file "#{stack_name}/stack.yml", {
-          "type" => "stack",
-          "name" => stack.name,
-          "description" => stack.respond_to?(:description) ? stack.description : ""
+        create_folder(script_name)
+        create_file "#{script_name}/script.yml", {
+          "type" => "script",
+          "name" => script.name,
+          "description" => script.respond_to?(:description) ? script.description : ""
         }.to_yaml
         
-        create_folder "#{stack_name}/config"
+        create_folder "#{script_name}/config"
         
-        if stack.respond_to?(:controls)
-          controls = map stack.controls, "controls" do |c|
+        if script.respond_to?(:controls)
+          controls = map script.controls, "controls" do |c|
             { "name"  => c.name,
               "label" => c.label,
               "type"  => c._type }
@@ -36,18 +44,17 @@ module StackFu
           controls = []
         end
         
-        if stack.respond_to?(:requirements)
-          requirements = map stack.requirements, "requirements" do |req|
-            { "data"  => req.data,
-              "error" => req.error,
-              "type"  => req._type }
+        if script.respond_to?(:requirements)
+          requirements = map script.requirements, "requirements" do |req|
+            { "data"   => req.params.attributes["data"],
+              "type"   => req._type }
           end
         else
           requirements = []
         end
         
-        if stack.respond_to?(:executions)
-          executions = map stack.executions, "scripts" do |exec|
+        if script.respond_to?(:executions)
+          executions = map script.executions, "executions" do |exec|
             { "description" => exec.description,
               "file"        => exec.description.downcase.gsub(" ", "_") }
           end
@@ -56,29 +63,28 @@ module StackFu
         end
         
         
-        if stack.respond_to?(:validations)
-          validations = map stack.validations, "validations" do |val|
-            { "data"  => val.data,
-              "error" => val.error,
-              "type"  => val._type }
+        if script.respond_to?(:validations)
+          validations = map script.validations, "validations" do |val|
+            { "data"   => val.params.attributes["data"],
+              "type"   => val._type }
           end
         else
           validations = []
         end
         
-        create_file "#{stack_name}/config/01-controls.yml", controls
-        create_file "#{stack_name}/config/02-requirements.yml", requirements
-        create_file "#{stack_name}/config/03-scripts.yml", executions
-        create_file "#{stack_name}/config/04-validations.yml", validations
+        create_file "#{script_name}/config/01-controls.yml", controls
+        create_file "#{script_name}/config/02-requirements.yml", requirements
+        create_file "#{script_name}/config/03-executions.yml", executions
+        create_file "#{script_name}/config/04-validations.yml", validations
         
-        create_folder "#{stack_name}/script"
-        stack.executions.each do |script|
-          create_file "#{stack_name}/script/#{script.description.downcase.gsub(" ", "_")}.sh.erb", script.script
+        create_folder "#{script_name}/executables"
+        script.executions.each do |script|
+          create_file "#{script_name}/executables/#{script.description.downcase.gsub(" ", "_")}.sh.erb", script.body
         end
         
-        puts "Stack #{stack_name} dumped successfully..."
+        puts "Script #{script_name} dumped successfully..."
       else
-        puts "Stack '#{stack_name}' was not found"
+        puts "Script '#{script_name}' was not found"
       end
     end
     

data/lib/stackfu/commands/generate_command.rb

@@ -1,12 +1,9 @@
 require 'erb'
 require 'ostruct'
 
-module StackFu
+module StackFu::Commands
   class GenerateCommand < Command
     aliases :create
-    subcommand :stack, :required_parameters => [:stack_name]
-    subcommand :plugin, :required_parameters => [:plugin_name]
-    error_messages :missing_subcommand => "You have to tell what you want to generate: a stack or a plugin."
   
     Types = { 
       [:checkbox, :numericbox, :combobox, :password, :radio, :textbox] => :control
@@ -30,7 +27,8 @@ module StackFu
       generate("stack", parameters, options)
     end
   
-    def generate(what, parameters, options)
+    def default(parameters, options)
+      what = 'script'
       begin
         item_name = parameters.shift
         items = {}
@@ -38,8 +36,8 @@ module StackFu
           name, type = p.split(":")
         
           case type(type)
-          when :script
-            (items["scripts"]||=[]) << [name, template("script.sh.erb", {
+          when :execution, :script
+            (items["executions"]||=[]) << [name, template("script.sh.erb", {
               "filename" => name,
               "description" => name.titleize
             })]
@@ -56,13 +54,13 @@ module StackFu
       
         stack = template("stack.yml.erb", {
           "name" => item_name,
-          "description" => "Enter a description for this stack here"
+          "description" => "Enter a description for this script here"
         })
       
         create("#{item_name}", "#{what}.yml", stack)
 
         i = 1
-        %w[controls requirements scripts validations].each do |item|
+        %w[controls requirements executions validations].each do |item|
           template_name = "0#{i}-#{item}.yml"
           create "#{item_name}/config", template_name, template("#{template_name}.erb", {
             item => items[item]
@@ -70,9 +68,9 @@ module StackFu
           i += 1
         end
     
-        items["scripts"].try(:each) do |item|
-          create("#{item_name}/script", "#{item.first}.sh.erb", item.last)
-        end or create("#{item_name}/script")
+        items["executions"].try(:each) do |item|
+          create("#{item_name}/executables", "#{item.first}.sh.erb", item.last)
+        end or create("#{item_name}/executables")
       
         puts "#{what.titleize} #{item_name} created successfully"
       rescue Exceptions::InvalidParameter

data/lib/stackfu/commands/help_command.rb

@@ -1,4 +1,4 @@
-module StackFu
+module StackFu::Commands
   class HelpCommand < Command
     def default(parameters, options)
       stackfu = "stackfu".foreground(:green).bright