stackster 0.3.1 → 0.3.2

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: "rake spec"

data/CHANGELOG

@@ -1,3 +1,8 @@
+## v0.3.2
+
+* Removed the logger gem dependency
+* Refactored attributes handling so it refreshes them from simpledb each time they are requested
+
 ## v0.3.1
 
 * Fixed the CreatedAt value in simpledb by storing it as a string

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/intuit/stackster.png)](http://travis-ci.org/intuit/stackster)
+
 I help deploy Stacks into Cloud Formation.  I save data about them in SimpleDB.
 
 Getting Started

data/lib/stackster/entry.rb

@@ -2,15 +2,15 @@ require 'stackster/entry/entry_lister'
 
 module Stackster
   class Entry
-    attr_accessor :name, :attributes
+    attr_accessor :name
 
     def initialize(args)
       @domain = 'stacks'
       @config = args[:config]
       @logger = @config.logger
+      @custom_attributes = {}
       self.name = region_specific_name args[:name]
       create_domain
-      get_attributes
     end
 
     def self.find(args)
@@ -19,21 +19,33 @@ module Stackster
       entry
     end
 
+    def attributes
+      u = {}
+
+      attrs = sdb_connect.select "select * from stacks where itemName() = '#{name}'"
+      if attrs.has_key? name
+        u.merge! Hash[attrs[name].map { |k,v| [k, v.first] }]
+      end
+
+      u.merge @custom_attributes
+    end
+
     def set_attributes(a)
       a.each { |attribute| set_attribute(attribute) }
     end
 
     def save
       set_default_attributes
+      current_attributes = attributes
 
-      attributes.each_pair do |key,value|
+      current_attributes.each_pair do |key,value|
         @logger.debug "Setting attribute #{key}=#{value}"
       end
 
       sdb_connect.put_attributes('stacks', 
                                   name, 
-                                  attributes, 
-                                 :replace => attributes.keys )
+                                  current_attributes, 
+                                 :replace => current_attributes.keys )
 
       @logger.debug "Save to SimpleDB successful."
     end
@@ -46,17 +58,8 @@ module Stackster
     private
 
     def set_default_attributes
-      attributes.merge!('Name' => name)
-      attributes.merge!('CreatedAt' => Time.now.utc.to_s)
-    end
-
-    def get_attributes
-      u = {}
-      attrs = sdb_connect.select "select * from stacks where itemName() = '#{name}'"
-      if attrs[name]
-        attrs[name].each_pair { |k, v| u[k] = v.first }
-      end
-      self.attributes = u
+      @custom_attributes.merge! 'Name' => name
+      @custom_attributes.merge! 'CreatedAt' => Time.now.utc.to_s
     end
 
     def region_specific_name(name)
@@ -68,12 +71,12 @@ module Stackster
     end
 
     def set_attribute(attribute)
-      self.attributes = attributes.merge(attribute)
+      @custom_attributes.merge! attribute
     end
 
     def sdb_connect
       @sdb_connect ||= AWS::SimpleDB.new :config => @config
     end
-
   end
+
 end

data/lib/stackster/version.rb

@@ -1,3 +1,3 @@
 module Stackster
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/entry_spec.rb

@@ -11,9 +11,6 @@ describe Stackster do
     @simple_db_mock.should_receive(:create_domain).
                     with("stacks").
                     and_return true
-    @simple_db_mock.should_receive(:select).
-                    with("select * from stacks where itemName() = 'test-stack-us-west-1'").
-                    and_return('stack-to-find' => { 'attr1' => 'value1' })
     entry = Stackster::Entry.new :config => config,
                                  :name   => 'test-stack'
     entry.class.should == Stackster::Entry
@@ -29,9 +26,6 @@ describe Stackster do
     @simple_db_mock.should_receive(:create_domain).
                     with("stacks").
                     and_return true
-    @simple_db_mock.should_receive(:select).
-                    with("select * from stacks where itemName() = 'stack-to-find-us-west-1'").
-                    and_return('stack-to-find' => { 'attr1' => 'value1' })
     Stackster::Entry.find :name   => 'stack-to-find',
                           :config => config
   end
@@ -46,9 +40,6 @@ describe Stackster do
       @simple_db_mock.should_receive(:create_domain).
                       with("stacks").
                       and_return true
-      @simple_db_mock.should_receive(:select).
-                      with("select * from stacks where itemName() = 'test-stack-us-west-1'").
-                      and_return('test-stack' => { 'attr1' => 'value1' })
       @entry = Stackster::Entry.new :config => @config,
                                     :name   => 'test-stack'
     end
@@ -60,22 +51,30 @@ describe Stackster do
     it "should set the attributes in simple db including default attributes" do
       Timecop.travel Time.utc(2012, 10, 22, 13, 30)
 
+      @simple_db_mock.should_receive(:select).
+                      with("select * from stacks where itemName() = 'test-stack-us-west-1'").
+                      and_return('test-stack-us-west-1' => { 'key1' => ['value1'] })
       @simple_db_mock.should_receive(:put_attributes).
                       with("stacks", 
                            "test-stack-us-west-1", 
-                           { "key" => "value", "Name" => "test-stack-us-west-1", "CreatedAt" => "2012-10-22 13:30:00 UTC" }, 
-                           { :replace => ["key", "Name", "CreatedAt"] } )
-      @entry.attributes = {"key"=>"value"}
+                           { "key"       => "value",
+                             "key1"      => "value1",
+                             "Name"      => "test-stack-us-west-1",
+                             "CreatedAt" => "2012-10-22 13:30:00 UTC" }, 
+                           { :replace => ["key1", "key", "Name", "CreatedAt"] } )
+      @entry.set_attributes(['key' => 'value'])
       
       @entry.save
     end
 
-    it "should set the attributes" do
-      @entry.attributes = {'key1' => 'value1' }
-      @entry.set_attributes(['key2' => 'value2'])
-      @entry.attributes.should == {'key1' => 'value1', 'key2' => 'value2' }
-    end
+    it "should merge custom attributes" do
+      @simple_db_mock.should_receive(:select).
+                      with("select * from stacks where itemName() = 'test-stack-us-west-1'").
+                      and_return('test-stack' => { 'key1' => ['value1'] })
+      @entry.set_attributes(['key1' => 'value2'])
 
+      @entry.attributes.should == {'key1' => 'value2' }
+    end
   end
 
 end

data/stackster.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "timecop"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 2.11.0"
+  s.add_development_dependency "simplecov", "~> 0.6.4"
+  s.add_development_dependency "timecop", "~> 0.5.3"
 
-  s.add_runtime_dependency "fog"
-  s.add_runtime_dependency 'logger'
-  s.add_runtime_dependency "trollop"
-  s.add_runtime_dependency "xml-simple"
+  s.add_runtime_dependency "fog", "= 1.6.0"
+  s.add_runtime_dependency "trollop", "= 2.0"
+  s.add_runtime_dependency "xml-simple", "= 1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackster
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,101 +28,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.5.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 description: Thats what I do
 email:
 - brett@weav.net
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -161,7 +162,6 @@ files:
 - lib/stackster/stack/stack_updater.rb
 - lib/stackster/stack/status.rb
 - lib/stackster/version.rb
-- script/ci_setup
 - spec/aws/cloud_formation/error_spec.rb
 - spec/aws/cloud_formation_spec.rb
 - spec/aws/ec2_spec.rb
@@ -193,12 +193,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3770927478865725038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3770927478865725038
 requirements: []
 rubyforge_project: stackster
 rubygems_version: 1.8.24

data/script/ci_setup

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Source RVM profile and set ruby / gemset
-. /etc/profile
-
-# Use stackster gemset
-rvm use "1.9.3-p194@stackster" --create
-
-# Exit with error if any command returns non zero
-set -e
-
-# Bundle gems
-bundle
-
-# Run spec tests
-rake spec