stackster 0.0.2 → 0.0.3

data/lib/stackster/aws/cloud_formation.rb

@@ -4,11 +4,11 @@ module Stackster
   class AWS
     class CloudFormation
 
-      def initialize(environment)
-        c = Config.environment environment
-        @connect = Fog::AWS::CloudFormation.new :aws_access_key_id => c['access_key'],
-                                           :aws_secret_access_key => c['secret_key'],
-                                           :region => c['region']
+      def initialize(args)
+        c = args[:config]
+        @connect = Fog::AWS::CloudFormation.new :aws_access_key_id => c.access_key,
+                                                :aws_secret_access_key => c.secret_key,
+                                                :region => c.region
       end
 
       def create(args)
@@ -42,7 +42,7 @@ module Stackster
       end
 
       def template(name)
-        @connect.get_template(name)
+        @connect.get_template(name).body['TemplateBody']
       end
 
     end

data/lib/stackster/aws/ec2.rb

@@ -4,11 +4,11 @@ module Stackster
   class AWS
     class EC2
 
-      def initialize(environment)
-        c = Config.environment environment
-        @connect = Fog::Compute::AWS.new :aws_access_key_id => c['access_key'],
-                                     :aws_secret_access_key => c['secret_key'],
-                                     :region => c['region']
+      def initialize(args)
+        c = args[:config]
+        @connect = Fog::Compute::AWS.new :aws_access_key_id => c.access_key,
+                                     :aws_secret_access_key => c.secret_key,
+                                     :region => c.region
       end
 
       def describe_instances

data/lib/stackster/aws/simpledb.rb

@@ -4,11 +4,11 @@ module Stackster
   class AWS
     class SimpleDB
 
-      def initialize(environment)
-        c = Config.environment environment
-        @connect = Fog::AWS::SimpleDB.new :aws_access_key_id => c['access_key'],
-                                      :aws_secret_access_key => c['secret_key'],
-                                      :region => c['region']
+      def initialize(args)
+        c = args[:config]
+        @connect = Fog::AWS::SimpleDB.new :aws_access_key_id => c.access_key,
+                                          :aws_secret_access_key => c.secret_key,
+                                          :region => c.region
       end
 
       def domains

data/lib/stackster/cli.rb

@@ -5,11 +5,18 @@ module Stackster
     def self.start
       @opts = Trollop::options do
         banner <<-EOS
-build and manage stacks
+
+I build and manage AWS Cloud Formation Stacks
+
+stackster list 
+stackster create -n STACK_NAME -a ATTRIBUTES -t TEMPLATE_PATH
+stackster update -n STACK_NAME -a ATTRIBUTES
+stackster show -n STACK_NAME
+stackster destroy -n STACK_NAME
+
 EOS
         opt :help, "Display Help"
         opt :attributes, "CSV list of = seperated attributes to set", :type => :string
-        opt :environment, "Set the target environment", :type => :string
         opt :name, "Stack name to manage", :type => :string
         opt :template, "Path to the template file", :type => :string
       end
@@ -17,13 +24,9 @@ EOS
       @cmd = ARGV.shift
 
       case @cmd
-      when 'create', 'destroy', 'delete', 'list', 'update'
-        unless EnvironmentLister.all.include? @opts[:environment]
-          puts "Please specify a valid environment: #{EnvironmentLister.all}"
-          exit 1
-        end
-        @s = Stack.new :environment => @opts[:environment],
-                       :name => @opts[:name]
+      when 'create', 'destroy', 'delete', 'list', 'update', 'show'
+        @s = Stack.new :name => @opts[:name],
+                       :config => nil
       end
 
       read_attributes
@@ -39,15 +42,10 @@ EOS
       when 'destroy', 'delete'
         @s.destroy
         puts "#{@opts[:name]} destroyed."
-      when 'environments'
-        puts EnvironmentLister.all
       when 'show'
-        sf = StackFormater.new :environment => @opts[:environment],
-                               :name => @opts[:name]
-        puts sf.display.to_yaml
+        puts @s.display.to_yaml
       when 'list'
-        s = StackLister.new @opts[:environment]
-        puts s.all
+        puts Stack.list(:config => nil)
       else
         puts "Unkown command '#{@cmd}'"
       end

data/lib/stackster/config.rb

@@ -1,19 +1,25 @@
 module Stackster
   class Config
-    def self.load_config_file(config_file = "#{ENV['HOME']}/.stackster.yml")
-      YAML::load File.open( config_file )
+
+    def initialize(args = {})
+      @config = args[:config]
+    end
+
+    def load_config_file
+      config_file = "#{ENV['HOME']}/.stackster.yml"
+      @config ? @config : (YAML::load File.open( config_file ))
     end
 
-    def self.environment(environment)
-      load_config_file[environment]
+    def access_key
+      load_config_file['access_key']
     end
 
-    def self.region(environment)
-      load_config_file[environment]['region']
+    def secret_key
+      load_config_file['secret_key']
     end
 
-    def self.environments
-      load_config_file.keys
+    def region
+      load_config_file['region']
     end
 
   end

data/lib/stackster/entry/entry_lister.rb

@@ -1,10 +1,10 @@
 module Stackster
   class EntryLister
 
-    def initialize(environment)
-      @environment = environment
+    def initialize(args)
       @domain = 'stacks'
-      @sdb_connect = AWS::SimpleDB.new @environment
+      @config = args[:config]
+      @sdb_connect = AWS::SimpleDB.new :config => args[:config]
     end
 
     def all

data/lib/stackster/entry.rb

@@ -5,28 +5,26 @@ module Stackster
     attr_accessor :name, :attributes
 
     def initialize(args)
-      @environment = args[:environment]
       @domain = 'stacks'
-      @sdb_connect = AWS::SimpleDB.new @environment
-      self.name = "#{args[:name]}-#{Config.region @environment}"
-      create_domain
+      @config = args[:config]
+      self.name = "#{args[:name]}-#{@config.region}"
       get_attributes
     end
 
     def self.find(args)
       e = Entry.new :name => args[:name],
-                    :environment => args[:environment] 
+                    :config => args[:config]
       e.get_attributes
       e
     end
 
     def create_domain
-      @sdb_connect.create_domain(@domain)
+      sdb_connect.create_domain @domain
     end
 
     def get_attributes
       u = {}
-      attrs = @sdb_connect.select("select * from stacks where itemName() = '#{name}'")
+      attrs = sdb_connect.select("select * from stacks where itemName() = '#{name}'")
       if attrs[name]
         attrs[name].each_pair do |k, v|
           u[k] = v.first
@@ -37,7 +35,7 @@ module Stackster
 
     def save
       attributes.each_pair do |k,v|
-        @sdb_connect.put_attributes('stacks', name, { k => v }, { :replace => k })
+        sdb_connect.put_attributes('stacks', name, { k => v }, { :replace => k })
       end
     end
 
@@ -46,11 +44,18 @@ module Stackster
     end
 
     def set_attribute(attribute)
+      create_domain
       self.attributes = attributes.merge(attribute)
     end
 
     def delete_attributes
-      @sdb_connect.delete('stacks', name)
+      sdb_connect.delete('stacks', name)
+    end
+
+    private
+
+    def sdb_connect
+      @sdb_connect ||= AWS::SimpleDB.new :config => @config
     end
 
   end

data/lib/stackster/instance/instance_reader.rb

@@ -1,9 +1,8 @@
 module Stackster
   class InstanceReader
 
-    def initialize(environment)
-      @environment = environment
-      @ec2 = AWS::EC2.new @environment
+    def initialize(args)
+      @ec2 = AWS::EC2.new :config => args[:config]
     end
 
     # Data structure is return deffernelty for class

data/lib/stackster/stack/stack_creater.rb

@@ -4,10 +4,11 @@ module Stackster
   class StackCreater
 
     def initialize(args)
-      @cf = AWS::CloudFormation.new args[:environment]
+      @config = args[:config]
       @entry = args[:entry]
       @name = args[:name]
       @template = read_template_from_file args[:template]
+      @cf = AWS::CloudFormation.new :config => @config
     end
 
     def read_template_from_file(template_file)

data/lib/stackster/stack/stack_destroyer.rb

@@ -2,8 +2,9 @@ module Stackster
   class StackDestroyer
 
     def initialize(args)
-      @cf = AWS::CloudFormation.new args[:environment]
+      @config = args[:config]
       @name = args[:name]
+      @cf = AWS::CloudFormation.new :config => @config
     end
 
     def destroy

data/lib/stackster/stack/stack_formater.rb

@@ -2,23 +2,23 @@ module Stackster
   class StackFormater
 
     def initialize(args)
-      @sr = StackReader.new :name => args[:name],
-                            :environment => args[:environment]
+      @name = args[:name]
+      @config = args[:config]
     end
 
     def display
       { 
-        'attributes'      => @sr.attributes,
-        'status'          => @sr.status,
-        'outputs'         => @sr.outputs,
-        'events'          => @sr.events,
-        'resources'       => @sr.resources,
+        'attributes'      => stack_reader.attributes,
+        'status'          => stack_reader.status,
+        'outputs'         => stack_reader.outputs,
+        'events'          => stack_reader.events,
+        'resources'       => stack_reader.resources,
         'instances'       => instances_public_ip_addresses
       }
     end
 
     def instances_public_ip_addresses
-      @sr.instances.map { |i| i['instancesSet'].first['ipAddress'] }
+      stack_reader.instances.map { |i| i['instancesSet'].first['ipAddress'] }
     end
 
     def attribute_names
@@ -26,22 +26,29 @@ module Stackster
     end
 
     def attributes
-      @sr.attributes
+      stack_reader.attributes
     end
 
     def resources_summary
-      @sr.resources.map do |i| 
+      stack_reader.resources.map do |i| 
         { 'LogicalResourceId' => i['LogicalResourceId'],
           'PhysicalResourceId' => i['PhysicalResourceId'] }
       end
     end
 
     def events_summary
-      @sr.events.map do |i| 
+      stack_reader.events.map do |i| 
         { 'ResourceStatus' => i['ResourceStatus'],
           'LogicalResourceId' => i['LogicalResourceId'] }
       end
     end
 
+    private
+
+    def stack_reader
+      @stack_reader ||= StackReader.new :name   => @name,
+                                        :config => @config
+    end
+
   end
 end

data/lib/stackster/stack/stack_lister.rb

@@ -1,13 +1,12 @@
 module Stackster
   class StackLister
 
-    def initialize(environment)
-      @environment = environment
-      @cf = AWS::CloudFormation.new @environment
+    def initialize(args={})
+      @config = args[:config]
     end
 
     def all
-      e = EntryLister.new @environment
+      e = EntryLister.new :config => @config
       e.all
     end
 

data/lib/stackster/stack/stack_reader.rb

@@ -3,10 +3,10 @@ module Stackster
 
     def initialize(args)
       @name = args[:name]
-      @environment = args[:environment]
-      @cf = AWS::CloudFormation.new @environment
+      @config = args[:config]
+      @cf = AWS::CloudFormation.new :config => @config
       @entry = Entry.find :name => @name,
-                          :environment => @environment
+                          :config => @config
     end
 
     def attributes
@@ -33,12 +33,8 @@ module Stackster
       @cf.template @name
     end
 
-    def last_event
-      events.first
-    end
-
     def instances
-      ir = InstanceReader.new @environment
+      ir = InstanceReader.new :config => @config
       ir.list_stack_instances @name
     end
 

data/lib/stackster/stack.rb

@@ -8,27 +8,22 @@ module Stackster
   class Stack
 
     def initialize(args)
+      @config = Config.new :config => args[:config]
       @name = args[:name]
-      @environment = args[:environment]
       @entry = Entry.new :name => @name,
-                         :environment => @environment
+                         :config => @config
+    end
+
+    def self.list(args)
+      @config = Config.new :config => args[:config]
+      StackLister.new(:config => @config).all
     end
 
     def create(args)
+      @template = args[:template]
       @entry.set_attributes args[:attributes]
       @entry.save
-
-      s = StackCreater.new :name => @name,
-                           :environment => @environment,
-                           :entry => @entry,
-                           :template => args[:template]
-      s.create
-    end
-
-    def show
-      s = StackReader.new :name => @name,
-                          :environment => @environment
-      s.show
+      stack_creater.create
     end
 
     def update(args)
@@ -37,11 +32,73 @@ module Stackster
     end
 
     def destroy
-      s = StackDestroyer.new :name => @name,
-                             :environment => @environment
-      s.destroy
+      stack_destroyer.destroy
       @entry.delete_attributes
     end
+    
+    def attributes
+      stack_formater.attributes
+    end
+
+    def display
+      stack_formater.display
+    end
+
+    def show
+      stack_reader.show
+    end
+
+    def outputs
+      stack_reader.outputs
+    end
+
+    def status
+      stack_reader.status
+    end
+
+    def events
+      stack_reader.events
+    end
+
+    def instances
+      stack_reader.instances
+    end
+
+    def instances_public_ip_addresses
+      stack_formater.instances_public_ip_addresses
+    end
+
+    def resources
+      stack_reader.resources
+    end
+
+    def template
+      stack_reader.template
+    end
+
+    private
+
+    def stack_creater
+      @stack_creater ||= StackCreater.new :name     => @name,
+                                          :entry    => @entry,
+                                          :template => @template,
+                                          :config => @config
+    end
+
+    def stack_destroyer
+      @stack_destroyer ||= StackDestroyer.new :name => @name,
+                                              :config => @config
+    end
+
+    def stack_reader
+      @stack_reader ||= StackReader.new :name => @name,
+                                        :config => @config
+    end
+
+    def stack_formater
+      @stack_formater ||= StackFormater.new :name => @name,
+                                            :config => @config
+    end
 
   end
 end

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/stackster.rb

@@ -1,6 +1,5 @@
 require "stackster/aws"
 require "stackster/entry"
-require "stackster/environment"
 require "stackster/stack"
 require "stackster/instance"
 require "stackster/config"

data/spec/config_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Config do
+
+  it "should create a new config object" do
+    config = Stackster::Config.new
+    config.class.should == Stackster::Config
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'stackster'
+
+RSpec.configure do |config|
+  #spec config
+end

data/stackster.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec"
+
   s.add_runtime_dependency "fog"
   s.add_runtime_dependency "trollop"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70184879147220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70184879147220
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70121554327040 !ruby/object:Gem::Requirement
+  requirement: &70184879146560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121554327040
+  version_requirements: *70184879146560
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70121554326620 !ruby/object:Gem::Requirement
+  requirement: &70184879145980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121554326620
+  version_requirements: *70184879145980
 description: Thats what I do
 email:
 - brett@weav.net
@@ -54,8 +65,6 @@ files:
 - lib/stackster/config.rb
 - lib/stackster/entry.rb
 - lib/stackster/entry/entry_lister.rb
-- lib/stackster/environment.rb
-- lib/stackster/environment/environment_lister.rb
 - lib/stackster/instance.rb
 - lib/stackster/instance/instance_reader.rb
 - lib/stackster/stack.rb
@@ -65,6 +74,8 @@ files:
 - lib/stackster/stack/stack_lister.rb
 - lib/stackster/stack/stack_reader.rb
 - lib/stackster/version.rb
+- spec/config_spec.rb
+- spec/spec_helper.rb
 - stackster.gemspec
 homepage: ''
 licenses: []
@@ -80,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2367294800001160910
+      hash: -4572547021873888246
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,11 +100,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2367294800001160910
+      hash: -4572547021873888246
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: I make deployments easier
-test_files: []
+test_files:
+- spec/config_spec.rb
+- spec/spec_helper.rb

data/lib/stackster/environment/environment_lister.rb

@@ -1,9 +0,0 @@
-module Stackster
-  class EnvironmentLister
-
-    def self.all
-      Config.environments
-    end
-
-  end
-end

data/lib/stackster/environment.rb

@@ -1 +0,0 @@
-require 'stackster/environment/environment_lister'