simple_deploy 0.0.3 → 0.1.0

data/lib/simple_deploy/artifact.rb

@@ -1,5 +1,4 @@
 require 'heirloom'
-require 'simple_deploy/artifact/artifact_lister'
 
 module SimpleDeploy
   class Artifact
@@ -8,7 +7,11 @@ module SimpleDeploy
 
     def initialize(args)
       @region = args[:region]
-      self.metadata = Heirloom::Heirloom.info(args)
+      @config = args[:config]
+      @artifact = Heirloom::Artifact.new :config => @config.artifact_repository
+
+      self.metadata = @artifact.show :name => args[:name],
+                                     :id   => args[:id]
     end
 
     def all_endpoints

data/lib/simple_deploy/cli.rb

@@ -40,8 +40,9 @@ EOS
 
       read_attributes
       
-      unless @cmd == 'artifacts' || @cmd == 'environments'
-        @config = Config.new.environment(@opts[:environment])
+      unless @cmd == 'environments'
+        @config = Config.new.environment @opts[:environment]
+
         unless environment_provided?
           puts "Please specify an environment."
           exit 1
@@ -60,9 +61,6 @@ EOS
       case @cmd
       when 'attributes'
         @stack.attributes.each_pair { |k, v| puts "#{k}: #{v}" }
-      when 'artifacts'
-        a = ArtifactLister.new
-        puts a.summary
       when 'create'
         @stack.create :attributes => attributes,
                       :template => @opts[:template]

data/lib/simple_deploy/config.rb

@@ -40,5 +40,9 @@ module SimpleDeploy
       environment(name)['region']
     end
 
+    def artifact_repository
+      config['artifact_repository']
+    end
+
   end
 end

data/lib/simple_deploy/deployment.rb

@@ -23,9 +23,9 @@ module SimpleDeploy
     private
 
     def set_deploy_command
-      cmd = ""
+      cmd = get_artifact_endpoints.any? ? "env " : ""
       get_artifact_endpoints.each_pair do |k,v|
-        cmd += "env #{k}=#{v} "
+        cmd += "#{k}=#{v} "
       end
       cmd += @deploy_script
 
@@ -39,10 +39,12 @@ module SimpleDeploy
       @config.artifacts.each do |a|
         name = a['name']
         endpoint = a['endpoint']
-        artifact = Artifact.new :class => name,
-                                :sha => @attributes[name],
-                                :region => @region
-        h[name] = artifact.all_endpoints[endpoint]
+        variable = a['variable']
+        artifact = Artifact.new :name => name,
+                                :id => @attributes[name],
+                                :region => @region,
+                                :config => @config
+        h[variable] = artifact.all_endpoints[endpoint]
       end
       h
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/simple_deploy.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "heirloom", '= 0.0.7'
-  s.add_runtime_dependency "stackster", '= 0.0.4'
+  s.add_runtime_dependency "heirloom", '= 0.0.9'
+  s.add_runtime_dependency "stackster", '= 0.0.5'
   s.add_runtime_dependency "trollop"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70182014203000 !ruby/object:Gem::Requirement
+  requirement: &70196644202100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182014203000
+  version_requirements: *70196644202100
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70182014202500 !ruby/object:Gem::Requirement
+  requirement: &70196644201500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182014202500
+  version_requirements: *70196644201500
 - !ruby/object:Gem::Dependency
   name: heirloom
-  requirement: &70182014201980 !ruby/object:Gem::Requirement
+  requirement: &70196644200800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70182014201980
+  version_requirements: *70196644200800
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70182014216660 !ruby/object:Gem::Requirement
+  requirement: &70196644200040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70182014216660
+  version_requirements: *70196644200040
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70182014215840 !ruby/object:Gem::Requirement
+  requirement: &70196644199620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182014215840
+  version_requirements: *70196644199620
 description: Its what I do
 email:
 - brett@weav.net
@@ -81,7 +81,6 @@ files:
 - bin/simple_deploy
 - lib/simple_deploy.rb
 - lib/simple_deploy/artifact.rb
-- lib/simple_deploy/artifact/artifact_lister.rb
 - lib/simple_deploy/artifact/artifact_reader.rb
 - lib/simple_deploy/cli.rb
 - lib/simple_deploy/cli/variables.rb
@@ -109,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1984380611216659406
+      hash: 523987936351043911
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1984380611216659406
+      hash: 523987936351043911
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16

data/lib/simple_deploy/artifact/artifact_lister.rb

@@ -1,18 +0,0 @@
-module SimpleDeploy
-  class ArtifactLister
-
-    def list
-      Heirloom::Heirloom.list.keys
-    end
-
-    def all(args)
-      artifacts = Heirloom::Heirloom.list
-      artifacts[args[:class]]
-    end
-
-    def summary
-      list 
-    end
-
-  end
-end