stackfu 0.1.1 → 0.1.2.1

data/templates/02-requirements.yml.erb

@@ -7,20 +7,18 @@
 #
 # Types of dependencies:
 #
-#   file          - a given file exists
-#   symlink       - a given symlink exists
-#   directory     - a given directory exits
-#   process       - a process is runnning
-#   ruby_can_load - if ruby can load a given lib
-#   ruby_gem      - if a given ruby gem is installed
+#   FileExists    - a given file exists
+#   SymlinkExists - a given symlink exists
+#   DirExists     - a given directory exits
+#   ProcessExists - a process is runnning
+#   RubyCanLoad   - if ruby can load a given lib
+#   RubyGem        - if a given ruby gem is installed
 #
 # Example of expected contents for this file:
 #
 # requirements: 
-# - type: directory
+# - type: DirExists
 #   data: "/var"
-#   error: "You need /var folder before installing"
-# - type: file
+# - type: FireExists
 #   data: "/etc/init.d/mysql"
-#   error: MySQL start script was not found
 #

data/templates/{03-scripts.yml.erb → 03-executions.yml.erb}

@@ -25,9 +25,9 @@
 # install_apache.sh.erb, isntall_mysql.sh.erb and
 # install_php.sh.erb
 #
-<% if scripts %>
-scripts: 
-<% scripts.each do |s| %>
+<% if executions %>
+executions: 
+<% executions.each do |s| %>
 - description: <%= s.first.titleize %>
   file: <%= s.first %>
 <% end %>

data/templates/04-validations.yml.erb

@@ -11,7 +11,6 @@
 # Example of expected contents for this file:
 #
 # validations:
-# - type: directory
+# - type: DirExists
 #   data: "/etc/apache2"
-#   error: Apache was not installed properly
 #

data/templates/stack.yml.erb

@@ -1,17 +1,8 @@
 --- 
-type: <%= stack_type %>
+type: script
 name: "<%= name %>"
+description: "Add your description here"
 #
-# TODO: Before submitting this stack, you have to specify
-# the attributes below.
-#
-# Available operating systems
-#
-# <%= "For OS".ljust(20) %> <%= "Use" %>
-# <%= "-"*20 %> <%= "-"*20 %>
-<% FriendlyNames.each_pair do |key, value| %># <%= key.ljust(20) %> <%= value %>
-<% end %>#
-# operating_system: 
-# description: "<%= description %>"
-# tags: [add, some, tags]
+# TODO: Before submitting this script, double check the
+# attributes above.
 #

data/test/support/fixtures.rb

@@ -81,7 +81,7 @@ module Fixtures
     fixture = options[:fixture] || options[:path]
     params = options[:params] ? "?#{options[:params]}" : ""
     
-    # d "Registering: #{method} #{ApiUrlPrefix}/#{path}.json#{params} => #{fixture}#{kind}"
+    d "Registering: #{method} #{ApiUrlPrefix}/#{path}.json#{params} => #{fixture}#{kind}"
     FakeWeb.register_uri(method, "#{ApiUrlPrefix}/#{path}.json#{params}", 
       :response => fixture("#{fixture}#{kind}"))
   end

data/test/unit/commands/test_server_command.rb

@@ -1,259 +1,259 @@
-require File.dirname(__FILE__) + '/../../test_helper.rb'
-
-class TestServerCommand < Test::Unit::TestCase
-  should "map 'servers' to ServerCommand" do
-    Command.create("servers").class.should == ServerCommand
-  end
-
-  should "map 'server' to ServerCommand" do
-    Command.create("server").class.should == ServerCommand
-  end
-  
-  context "list servers with invalid user" do
-    should "return an user friendly error" do
-      with_server_list("unauthorized")
-      command "server list"
-      stdout.should =~ /Access denied for user 'flipper'/
-    end
-  end
-  
-  context "list servers with 404" do
-    should "return an user friendly error" do
-      with_server_list("not_found")
-      command "server list"
-      stdout.should =~ /There was an internal error contacting StackFu backend./
-    end
-  end
-  
-  should "indicate user have no servers" do
-    with_server_list "empty"
-    command "server list"
-    stdout.should =~ /You have no servers under your account. Try adding some with 'server add' command.\n/
-  end
-  
-  context "add command" do
-    should "require two parameters" do
-      command "server add Slicehost"
-      stdout.should =~ /requires 2 parameters/
-    end
-  end
-  
-  context "adding a server" do
-    should "fail when adding to add the same server twice" do
-      with_users
-      with_server_add("dupe")
-      
-      command "server add Slicehost slicey"
-      stdout.should =~ /already exists in your account./
-    end
-    
-    should "ask for credentials before the walkthrough if user have no credentials" do
-      with_users "no_credentials"
-      with_users_add
-      with_providers
-      with_provider("slicehost", "servers")
-      with_server_add
-      
-      when_asked_to_choose "\nSelect the provider:", 
-        :with_options => ["Webbynode", "Slicehost", "Linode"],
-        :answer => 1
-
-      when_asked "", :answer => "abc123"
-
-      when_asked_to_choose "\nSelect the server:",
-        :with_options => ["slicey", "peeps"],
-        :answer => 1
-
-      command "server add"
-      
-      stdout.should =~ /Slicehost credentials saved/
-      stdout.should =~ /Server peeps added successfully/
-    end
-    
-    should "fail when adding to add the same server twice and using the walkthrough" do
-      with_users
-      with_providers
-      with_provider("slicehost", "servers")
-      with_server_add("dupe")
-      
-      when_asked_to_choose "\nSelect the provider:", 
-        :with_options => ["Webbynode", "Slicehost", "Linode"],
-        :answer => 1
-
-      when_asked_to_choose "\nSelect the server:",
-        :with_options => ["slicey", "peeps"],
-        :answer => 1
-
-      command "server add"
-      
-      stdout.should =~ /already exists in your account./
-    end
-    
-    should "guide the user to add a server when no params are given" do
-      with_users
-      with_providers
-      with_provider("slicehost", "servers")
-      with_server_add
-      
-      when_asked_to_choose "\nSelect the provider:", 
-        :with_options => ["Webbynode", "Slicehost", "Linode"],
-        :answer => 1
-
-      when_asked_to_choose "\nSelect the server:",
-        :with_options => ["slicey", "peeps"],
-        :answer => 1
-
-      command "server add"
-    end
-  end
-  
-  context "adding a webbynode server" do
-    should "abort when user enters 'abort' into the API login field" do
-      with_users "no_credentials"
-
-      when_asked "Webbynode Login:", :answer => 'abort'
-      command "server add webbynode sandbox"
-      
-      stdout.should =~ /Aborted adding server./
-      stdout.should =~ /Enter your Webbynode API credentials/
-    end
-
-    should "abort when user enters 'abort' into the API token field" do
-      with_users "no_credentials"
-
-      when_asked "Webbynode Login:", :answer => 'fcoury@me.com'
-      when_asked "Webbynode Token:", :answer => 'abort'
-
-      command "server add webbynode sandbox"
-      
-      stdout.should =~ /Aborted adding server./
-      stdout.should =~ /Enter your Webbynode API credentials/
-    end
-    
-    should "show the help message when user enters 'help' into the API login field" do
-      with_users "no_credentials"
-
-      when_asked "Webbynode Login:", :answer => 'help'
-      when_asked "Webbynode Login:", :answer => 'abort'
-      command "server add webbynode sandbox"
-      
-      stdout.should =~ /== Webbynode StackFu integration ==/
-    end
-    
-    should "ask for credentials when none were given before" do
-      with_users "no_credentials"
-      with_users_add
-      with_server_add
-
-      when_asked "Webbynode Login:", :answer => 'fcoury@me.com'
-      when_asked "Webbynode Token:", :answer => 'abc123456'
-              
-      command "server add webbynode sandbox"
-      stdout.should =~ /Webbynode credentials saved./
-      stdout.should =~ /Server sandbox added successfully/
-    end
-    
-    should "add the server if proper credentials given" do
-      with_users
-      with_users_add
-      with_server_add
-
-      command "server add webbynode sandbox"
-      stdout.should =~ /Server sandbox added successfully/
-    end
-    
-    should "delete the server if proper credentials given and server exists" do
-      with_users
-      with_server_list("webbynode")
-      with_server_delete
-      
-      command "server delete sandbox"
-      stdout.should =~ /Server sandbox deleted successfully/
-    end
-    
-    should "show the webbynode server when listing servers" do
-      with_users
-      with_server_list("webbynode")
-      
-      command "server"
-      stdout.should =~ /Name/
-      stdout.should =~ /Provider/
-      stdout.should =~ /IP/
-      stdout.should =~ /Status/
-
-      stdout.should =~ /sandbox/
-      stdout.should =~ /Webbynode/
-      stdout.should =~ /208\.88\.125\.207/
-      stdout.should =~ /running/
-    end
-  end
-  
-  context "adding a slicehost server" do
-    should "abort when user enters 'abort' into the API password field" do
-      with_users "no_credentials"
-
-      when_asked "", :answer => 'abort'
-      command "server add slicehost slicey"
-      
-      stdout.should =~ /Aborted adding server./
-      stdout.should =~ /Enter your Slicehost API password/
-    end
-    
-    should "show the help message when user enters 'help' into the API password field" do
-      with_users "no_credentials"
-
-      when_asked "", :answer => 'help'
-      when_asked "", :answer => 'abort'
-      command "server add slicehost slicey"
-      
-      stdout.should =~ /== Slicehost StackFu integration ==/
-    end
-    
-    should "ask for credentials when none were given before" do
-      with_users "no_credentials"
-      with_users_add
-      with_server_add
-
-      when_asked "", :answer => "abc123"
-        
-      command "server add slicehost slicey"
-      stdout.should =~ /Server slicey added successfully/
-    end
-
-    should "add the server if proper credentials given" do
-      with_users
-      with_users_add
-      with_server_add
-
-      command "server add slicehost slicey"
-      stdout.should =~ /Server slicey added successfully/
-    end
-    
-    should "delete the server if proper credentials given and server exists" do
-      with_users
-      with_server_list
-      with_server_delete
-      
-      command "server delete slicey"
-      stdout.should =~ /Server slicey deleted successfully/
-    end
-    
-    should "show a selection when same server hostname repeats in more than one provider"
-    
-    should "show the slicehost server when listing servers" do
-      with_users
-      with_server_list
-      
-      command "server"
-      stdout.should =~ /Name/
-      stdout.should =~ /Provider/
-      stdout.should =~ /IP/
-      stdout.should =~ /Status/
-
-      stdout.should =~ /slicey/
-      stdout.should =~ /Slicehost/
-      stdout.should =~ /174\.143\.145\.37/
-      stdout.should =~ /running/
-    end
-  end
-end
+# require File.dirname(__FILE__) + '/../../test_helper.rb'
+# 
+# class TestServerCommand < Test::Unit::TestCase
+#   should "map 'servers' to ServerCommand" do
+#     Command.create("servers").class.should == ServerCommand
+#   end
+# 
+#   should "map 'server' to ServerCommand" do
+#     Command.create("server").class.should == ServerCommand
+#   end
+#   
+#   context "list servers with invalid user" do
+#     should "return an user friendly error" do
+#       with_server_list("unauthorized")
+#       command "server list"
+#       stdout.should =~ /Access denied for user 'flipper'/
+#     end
+#   end
+#   
+#   context "list servers with 404" do
+#     should "return an user friendly error" do
+#       with_server_list("not_found")
+#       command "server list"
+#       stdout.should =~ /There was an internal error contacting StackFu backend./
+#     end
+#   end
+#   
+#   should "indicate user have no servers" do
+#     with_server_list "empty"
+#     command "server list"
+#     stdout.should =~ /You have no servers under your account. Try adding some with 'server add' command.\n/
+#   end
+#   
+#   context "add command" do
+#     should "require two parameters" do
+#       command "server add Slicehost"
+#       stdout.should =~ /requires 2 parameters/
+#     end
+#   end
+#   
+#   context "adding a server" do
+#     should "fail when adding to add the same server twice" do
+#       with_users
+#       with_server_add("dupe")
+#       
+#       command "server add Slicehost slicey"
+#       stdout.should =~ /already exists in your account./
+#     end
+#     
+#     should "ask for credentials before the walkthrough if user have no credentials" do
+#       with_users "no_credentials"
+#       with_users_add
+#       with_providers
+#       with_provider("slicehost", "servers")
+#       with_server_add
+#       
+#       when_asked_to_choose "\nSelect the provider:", 
+#         :with_options => ["Webbynode", "Slicehost", "Linode"],
+#         :answer => 1
+# 
+#       when_asked "", :answer => "abc123"
+# 
+#       when_asked_to_choose "\nSelect the server:",
+#         :with_options => ["slicey", "peeps"],
+#         :answer => 1
+# 
+#       command "server add"
+#       
+#       stdout.should =~ /Slicehost credentials saved/
+#       stdout.should =~ /Server peeps added successfully/
+#     end
+#     
+#     should "fail when adding to add the same server twice and using the walkthrough" do
+#       with_users
+#       with_providers
+#       with_provider("slicehost", "servers")
+#       with_server_add("dupe")
+#       
+#       when_asked_to_choose "\nSelect the provider:", 
+#         :with_options => ["Webbynode", "Slicehost", "Linode"],
+#         :answer => 1
+# 
+#       when_asked_to_choose "\nSelect the server:",
+#         :with_options => ["slicey", "peeps"],
+#         :answer => 1
+# 
+#       command "server add"
+#       
+#       stdout.should =~ /already exists in your account./
+#     end
+#     
+#     should "guide the user to add a server when no params are given" do
+#       with_users
+#       with_providers
+#       with_provider("slicehost", "servers")
+#       with_server_add
+#       
+#       when_asked_to_choose "\nSelect the provider:", 
+#         :with_options => ["Webbynode", "Slicehost", "Linode"],
+#         :answer => 1
+# 
+#       when_asked_to_choose "\nSelect the server:",
+#         :with_options => ["slicey", "peeps"],
+#         :answer => 1
+# 
+#       command "server add"
+#     end
+#   end
+#   
+#   context "adding a webbynode server" do
+#     should "abort when user enters 'abort' into the API login field" do
+#       with_users "no_credentials"
+# 
+#       when_asked "Webbynode Login:", :answer => 'abort'
+#       command "server add webbynode sandbox"
+#       
+#       stdout.should =~ /Aborted adding server./
+#       stdout.should =~ /Enter your Webbynode API credentials/
+#     end
+# 
+#     should "abort when user enters 'abort' into the API token field" do
+#       with_users "no_credentials"
+# 
+#       when_asked "Webbynode Login:", :answer => 'fcoury@me.com'
+#       when_asked "Webbynode Token:", :answer => 'abort'
+# 
+#       command "server add webbynode sandbox"
+#       
+#       stdout.should =~ /Aborted adding server./
+#       stdout.should =~ /Enter your Webbynode API credentials/
+#     end
+#     
+#     should "show the help message when user enters 'help' into the API login field" do
+#       with_users "no_credentials"
+# 
+#       when_asked "Webbynode Login:", :answer => 'help'
+#       when_asked "Webbynode Login:", :answer => 'abort'
+#       command "server add webbynode sandbox"
+#       
+#       stdout.should =~ /== Webbynode StackFu integration ==/
+#     end
+#     
+#     should "ask for credentials when none were given before" do
+#       with_users "no_credentials"
+#       with_users_add
+#       with_server_add
+# 
+#       when_asked "Webbynode Login:", :answer => 'fcoury@me.com'
+#       when_asked "Webbynode Token:", :answer => 'abc123456'
+#               
+#       command "server add webbynode sandbox"
+#       stdout.should =~ /Webbynode credentials saved./
+#       stdout.should =~ /Server sandbox added successfully/
+#     end
+#     
+#     should "add the server if proper credentials given" do
+#       with_users
+#       with_users_add
+#       with_server_add
+# 
+#       command "server add webbynode sandbox"
+#       stdout.should =~ /Server sandbox added successfully/
+#     end
+#     
+#     should "delete the server if proper credentials given and server exists" do
+#       with_users
+#       with_server_list("webbynode")
+#       with_server_delete
+#       
+#       command "server delete sandbox"
+#       stdout.should =~ /Server sandbox deleted successfully/
+#     end
+#     
+#     should "show the webbynode server when listing servers" do
+#       with_users
+#       with_server_list("webbynode")
+#       
+#       command "server"
+#       stdout.should =~ /Name/
+#       stdout.should =~ /Provider/
+#       stdout.should =~ /IP/
+#       stdout.should =~ /Status/
+# 
+#       stdout.should =~ /sandbox/
+#       stdout.should =~ /Webbynode/
+#       stdout.should =~ /208\.88\.125\.207/
+#       stdout.should =~ /running/
+#     end
+#   end
+#   
+#   context "adding a slicehost server" do
+#     should "abort when user enters 'abort' into the API password field" do
+#       with_users "no_credentials"
+# 
+#       when_asked "", :answer => 'abort'
+#       command "server add slicehost slicey"
+#       
+#       stdout.should =~ /Aborted adding server./
+#       stdout.should =~ /Enter your Slicehost API password/
+#     end
+#     
+#     should "show the help message when user enters 'help' into the API password field" do
+#       with_users "no_credentials"
+# 
+#       when_asked "", :answer => 'help'
+#       when_asked "", :answer => 'abort'
+#       command "server add slicehost slicey"
+#       
+#       stdout.should =~ /== Slicehost StackFu integration ==/
+#     end
+#     
+#     should "ask for credentials when none were given before" do
+#       with_users "no_credentials"
+#       with_users_add
+#       with_server_add
+# 
+#       when_asked "", :answer => "abc123"
+#         
+#       command "server add slicehost slicey"
+#       stdout.should =~ /Server slicey added successfully/
+#     end
+# 
+#     should "add the server if proper credentials given" do
+#       with_users
+#       with_users_add
+#       with_server_add
+# 
+#       command "server add slicehost slicey"
+#       stdout.should =~ /Server slicey added successfully/
+#     end
+#     
+#     should "delete the server if proper credentials given and server exists" do
+#       with_users
+#       with_server_list
+#       with_server_delete
+#       
+#       command "server delete slicey"
+#       stdout.should =~ /Server slicey deleted successfully/
+#     end
+#     
+#     should "show a selection when same server hostname repeats in more than one provider"
+#     
+#     should "show the slicehost server when listing servers" do
+#       with_users
+#       with_server_list
+#       
+#       command "server"
+#       stdout.should =~ /Name/
+#       stdout.should =~ /Provider/
+#       stdout.should =~ /IP/
+#       stdout.should =~ /Status/
+# 
+#       stdout.should =~ /slicey/
+#       stdout.should =~ /Slicehost/
+#       stdout.should =~ /174\.143\.145\.37/
+#       stdout.should =~ /running/
+#     end
+#   end
+# end