stackfu 0.1.0 → 0.1.1

data/Rakefile

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

data/lib/stackfu.rb

@@ -49,8 +49,8 @@ require "#{dir}/commands/deploy_command"
 require "#{dir}/commands/dump_command"
 
 module StackFu
-  VERSION = '0.0.1'
-  API = "http://api.stackfu.com"
+  VERSION = '0.1.1'
+  API = "http://stackfu.com"
   CONFIG_FILE = "#{ENV['HOME']}/.stackfu"
 
   include StackFu::OperatingSystems
@@ -86,3 +86,16 @@ class String
   end
 end
 
+# class ActiveResource::Connection
+#   # Creates new Net::HTTP instance for communication with
+#   # remote service and resources.
+#   def http
+#     http = Net::HTTP.new(@site.host, @site.port)
+#     http.use_ssl = @site.is_a?(URI::HTTPS)
+#     http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
+#     http.read_timeout = @timeout if @timeout
+#     #Here's the addition that allows you to see the output
+#     http.set_debug_output $stderr
+#     return http
+#   end
+# end

data/lib/stackfu/api_hooks.rb

@@ -1,16 +1,21 @@
 module StackFu
   module ApiHooks
-    class Server < ActiveResource::Base; end
-    class User < ActiveResource::Base; end
-    class Stack < ActiveResource::Base; end
-    class Plugin < ActiveResource::Base; end
-    class Provider < ActiveResource::Base; end
-    class Deployment < ActiveResource::Base; end
+    class Resource < ActiveResource::Base
+      self.format = :json
+    end
+    
+    class Server < Resource; end
+    class User < Resource; end
+    class Stack < Resource; end
+    class Plugin < Resource; end
+    class Provider < Resource; end
+    class Deployment < Resource; end
   
     def initialize_api(config)
       [Server, User, Stack, Plugin, Provider, Deployment].each do |model_class|
-        model_class.format = :json
-        model_class.site = StackFu::API.gsub(/api/, "#{config[:login]}:#{$config[:token]}@api") + "/"
+        model_class.user = $config[:token]
+        model_class.password = "X"
+        model_class.site = StackFu::API
       end
     end
   end

data/lib/stackfu/commands/dump_command.rb

@@ -3,11 +3,11 @@ module StackFu
     include ApiHooks
 
     error_messages :missing_subcommand => "You have to tell what you want to dump: a stack or a plugin"
-    subcommand :stack, :required_parameters => [:stack_name]
+    subcommand :plugin, :required_parameters => [:plugin_name]
     
-    def stack(parameters, options)
+    def plugin(parameters, options)
       stack_name = parameters[0]
-      stack = spinner { Stack.find(:all, :params => { :stack => { :name => stack_name } }).first }
+      stack = spinner { Plugin.find(stack_name) }
       
       if stack
         if directory?(stack_name) 
@@ -21,33 +21,49 @@ module StackFu
         create_file "#{stack_name}/stack.yml", {
           "type" => "stack",
           "name" => stack.name,
-          "description" => stack.description,
-          "operating_system" => stack.operating_system.to_s
+          "description" => stack.respond_to?(:description) ? stack.description : ""
         }.to_yaml
         
         create_folder "#{stack_name}/config"
         
-        controls = map stack.controls, "controls" do |c|
-          { "name"  => c.name,
-            "label" => c.label,
-            "type"  => c._type }
+        if stack.respond_to?(:controls)
+          controls = map stack.controls, "controls" do |c|
+            { "name"  => c.name,
+              "label" => c.label,
+              "type"  => c._type }
+          end
+        else
+          controls = []
         end
         
-        requirements = map stack.requirements, "requirements" do |req|
-          { "data"  => req.data,
-            "error" => req.error,
-            "type"  => req._type }
+        if stack.respond_to?(:requirements)
+          requirements = map stack.requirements, "requirements" do |req|
+            { "data"  => req.data,
+              "error" => req.error,
+              "type"  => req._type }
+          end
+        else
+          requirements = []
         end
         
-        executions = map stack.executions, "scripts" do |exec|
-          { "description" => exec.description,
-            "file"        => exec.description.downcase.gsub(" ", "_") }
+        if stack.respond_to?(:executions)
+          executions = map stack.executions, "scripts" do |exec|
+            { "description" => exec.description,
+              "file"        => exec.description.downcase.gsub(" ", "_") }
+          end
+        else
+          executions = []
         end
         
-        validations = map stack.validations, "validations" do |val|
-          { "data"  => val.data,
-            "error" => val.error,
-            "type"  => val._type }
+        
+        if stack.respond_to?(:validations)
+          validations = map stack.validations, "validations" do |val|
+            { "data"  => val.data,
+              "error" => val.error,
+              "type"  => val._type }
+          end
+        else
+          validations = []
         end
         
         create_file "#{stack_name}/config/01-controls.yml", controls
@@ -57,7 +73,7 @@ module StackFu
         
         create_folder "#{stack_name}/script"
         stack.executions.each do |script|
-          create_file "#{stack_name}/script/#{script.description.downcase.gsub(" ", "_")}.sh.erb", script.data
+          create_file "#{stack_name}/script/#{script.description.downcase.gsub(" ", "_")}.sh.erb", script.script
         end
         
         puts "Stack #{stack_name} dumped successfully..."

data/lib/stackfu/commands/list_command.rb

@@ -3,16 +3,17 @@ module StackFu
     include ApiHooks
   
     def default(parameters, options)
-      user = User.find(:all).first
+      # user = User.find(:all).first
       items = spinner { 
         [
-          Stack.find(:all, :conditions => { "user.id" => user.id }), 
-          Plugin.find(:all, :conditions => { "user.id" => user.id })
+          # Stack.find(:all, :conditions => { "user.id" => user.id }), 
+          Plugin.find(:all)
         ].flatten
       }
       
       params = {
-        :class => [Stack, Plugin], 
+        # :class => [Stack, Plugin], 
+        :class => [Plugin], 
         :collection => items,
         :display => [:name, :type, :description],
         :main_column => :name,
@@ -20,7 +21,11 @@ module StackFu
         :ansi => options[:plain].nil?
       }
 
-      puts table(params) { |item| [item.name, item.class.name.demodulize.downcase, item.description.try(:truncate_words)] }
+      puts table(params) { |item| 
+        description = item.respond_to?(:description) ? item.description : ""
+        
+        [item.name, "Plugin", description.truncate_words(10)]
+      }
     end
   end
 end

data/lib/stackfu/commands/publish_command.rb

@@ -52,8 +52,11 @@ module StackFu
         end
         
         item_class = ApiHooks.const_get("#{what.to_s.classify}")
+        item_class.format = :json
 
-        stacks = item_class.find(:all, :params => { what => { :name => stack_spec["name"] } })
+        stacks = item_class.find(:all) || []
+        stacks = stacks.select { |s| s.name == stack_spec["name"] }
+        
         if stacks.any? 
           unless options[:update]
             if agree("You already have a #{what} named #{stack_spec["name"]}. Do you want to update it?")
@@ -68,7 +71,7 @@ module StackFu
         
           stack = stacks.first
           begin
-            item_class.delete(stack.id)
+            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

data/lib/stackfu/helpers/rendering.rb

@@ -107,7 +107,16 @@ module StackFu
     
       display.each_with_index do |column, i|
         max_value_size = collection.map do |item|
-          value = block_given? ? yield(item)[i] : item.send(column)
+          if block_given?
+            value = yield(item)[i]
+          else
+            if item.respond_to?(column)
+              value = item.send(column)
+            else
+              value = ""
+            end
+          end
+          
           value.to_s.size
         end.max
       
@@ -150,7 +159,11 @@ module StackFu
             value = values[idx]
             idx += 1
           else
-            value = item.send(col[:name])
+            if item.respond_to?(col[:name])
+              value = item.send(col[:name])
+            else
+              value = ""
+            end
           end
         
           just_method = value.is_a?(Numeric) ? :rjust : :ljust

data/stackfu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stackfu}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-08-27}
+  s.date = %q{2010-08-29}
   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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Felipe Coury
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -03:00
+date: 2010-08-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency