composer 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 0.0.4:
+
+* Encrypt chef-repo and app by default
+* Passes in key to simple_deploy
+
 ## 0.0.3:
 
 * Re-releasing after bunk build

data/lib/composer/cli.rb

@@ -17,7 +17,8 @@ module Composer
       compose = Compose.new :config    => @config,
                             :name      => @opts[:name],
                             :key       => @opts[:key],
-                            :directory => @opts[:directory] ||= '.'
+                            :directory => @opts[:directory] ||= '.',
+                            :secret    => @opts[:secret]
       begin
         compose.check
         compose.run
@@ -69,15 +70,19 @@ module Composer
           options[:name] = n
         end
 
+        opts.on("-s", "--secret [SECRET]", "Encryption secret.") do |s|
+          options[:secret] = s
+        end
+
         opts.on("-r", "--region [REGION]", "Deployment Region.") do |r|
           options[:region] = r
         end
 
-        opts.on("-a", "--aws-access-key [AWS_ACCESS_KEY]", "AWS Access Key.") do |a|
+        opts.on("--aws-access-key [AWS_ACCESS_KEY]", "AWS Access Key.") do |a|
           options[:aws_access_key] = a
         end
 
-        opts.on("-s", "--aws-secret-key [AWS_SECRET_KEY]", "AWS Secret Key.") do |s|
+        opts.on("--aws-secret-key [AWS_SECRET_KEY]", "AWS Secret Key.") do |s|
           options[:aws_secret_key] = s
         end
       end.parse!

data/lib/composer/compose.rb

@@ -6,6 +6,7 @@ module Composer
       @key       = args[:key]
       @directory = args[:directory]
       @config    = args[:config]
+      @secret    = args[:secret]
     end
 
     def check
@@ -13,6 +14,7 @@ module Composer
       verify_config.verify_simple_deploy
       verify_config.verify_heirloom
       verify_name.verify :name => @name
+      verify_secret.verify :secret => @secret
       verify_key.verify :key => @key
       verify_directory.verify :directory => @directory
       verify_region.verify
@@ -22,10 +24,12 @@ module Composer
       setup_heirloom.setup :name  => @name
       setup_simple_deploy.setup
       deploy_heirloom.upload :directory => @directory,
-                             :name      => @name
+                             :name      => @name,
+                             :secret    => @secret
       deploy_stack.create :key       => @key,
                           :name      => @name,
-                          :directory => @directory
+                          :directory => @directory,
+                          :secret    => @secret
     end
 
     private
@@ -42,6 +46,10 @@ module Composer
       @verify_name ||= Verify::Name.new :config => @config
     end
 
+    def verify_secret
+      @verify_secret ||= Verify::Secret.new :config => @config
+    end
+
     def verify_key
       @verify_key ||= Verify::Key.new :config => @config
     end

data/lib/composer/deploy/heirloom.rb

@@ -8,8 +8,9 @@ module Composer
 
       def upload(args)
         @directory = args[:directory]
-        @name      = args[:name]
         @force     = args[:force]
+        @name      = args[:name]
+        @secret    = args[:secret]
 
         ["chef-repo", "app"].each do |heirloom|
           upload_heirloom heirloom
@@ -21,6 +22,7 @@ module Composer
       def upload_heirloom(heirloom)
         directory_to_upload = "#{@directory}/#{heirloom}"
         command = "heirloom upload -d #{directory_to_upload} -n #{@name}-#{heirloom} -i v1.0.0"
+        command << " -s #{@secret}" if @secret
         @logger.info "Uploading Heirloom: '#{@name}-#{heirloom}'"
         @logger.debug "Executing: `#{command}`"
         output = `#{command}`

data/lib/composer/deploy/stack.rb

@@ -9,17 +9,18 @@ module Composer
         directory          = args[:directory]
         key                = args[:key]
         name               = args[:name]
+        secret             = args[:secret]
 
         app_version        = 'v1.0.0'
         chef_version       = 'v1.0.0'
         environment_secret = 'password'
         environment        = 'default'
-        template           = "#{directory}/cloud-formation-templates/examples/classic/asg_with_cpu_scaling_policies.json"
+        template           = "#{directory}/cloud-formation-templates/examples/classic/asg.json"
 
         puts ""
         puts "Deploy Example Stack:"
         puts ""
-        puts "simple_deploy create -e #{environment} -n #{name} -t #{template} -a AppName=#{name} -a EnvironmentSecret=#{environment_secret} -a KeyName=#{key} -a app=#{app_version} -a chef_repo=#{chef_version} -a app_domain=#{name}-app -a chef_repo_domain=#{name}-chef-repo -a app_bucket_prefix=#{name} -a chef_repo_bucket_prefix=#{name}"
+        puts "simple_deploy create -e #{environment} -n #{name} -t #{template} -a AppName=#{name} -a EnvironmentSecret=#{environment_secret} -a KeyName=#{key} -a AppSecret=#{secret} -a ChefRepoSecret=#{secret} -a app=#{app_version} -a chef_repo=#{chef_version} -a app_domain=#{name}-app -a chef_repo_domain=#{name}-chef-repo -a app_bucket_prefix=#{name} -a chef_repo_bucket_prefix=#{name} -a chef_repo_encrypted=true -a app_encrypted=true"
       end
     end
   end

data/lib/composer/exceptions.rb

@@ -19,6 +19,9 @@ module Composer
   class InvalidRegion < ComposerException
   end
 
+  class InvalidSecret < ComposerException
+  end
+
   class UnsupportedRubyVersion < ComposerException
   end
 

data/lib/composer/verify.rb

@@ -3,6 +3,7 @@ require 'composer/verify/directory'
 require 'composer/verify/key'
 require 'composer/verify/config'
 require 'composer/verify/name'
+require 'composer/verify/secret'
 require 'composer/verify/region'
 
 module Composer

data/lib/composer/verify/secret.rb

@@ -0,0 +1,22 @@
+module Composer
+  module Verify
+    class Secret
+
+      def initialize(args)
+        @config = args[:config]
+        @logger = @config.logger
+      end
+
+      def verify(args)
+        secret = args[:secret]
+
+        if secret.length < 8
+          raise InvalidSecret.new "'#{secret}' must be at least 8 characters"
+        end
+
+        @logger.info "Application secret '#{secret}' is valid."
+      end
+
+    end
+  end
+end

data/lib/composer/version.rb

@@ -1,3 +1,3 @@
 module Composer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/compose_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper.rb'
 
 describe Composer::Compose do
   before do
-    @logger_stub = stub 'logger'
+    @logger_stub = stub 'logger', :debug => true, :info => true 
     @config_stub  = stub 'config', :logger => @logger_stub
 
     @compose = Composer::Compose.new :name      => 'name',
                                      :key       => 'key',
+                                     :secret    => 'test1234',
                                      :directory => '/tmp/dir',
                                      :config    => @config_stub
   end
@@ -51,7 +52,8 @@ describe Composer::Compose do
     Composer::Deploy::Heirloom.stub :new => @deploy_heirloom_mock
     @deploy_heirloom_mock.should_receive(:upload).
                           with(:directory => '/tmp/dir',
-                               :name      => 'name')
+                               :name      => 'name',
+                               :secret    => 'test1234')
 
     @deploy_stack_mock = mock 'deploy_stack'
     Composer::Deploy::Stack.stub :new => @deploy_stack_mock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126851371460 !ruby/object:Gem::Requirement
+  requirement: &70179448305860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126851371460
+  version_requirements: *70179448305860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126851370780 !ruby/object:Gem::Requirement
+  requirement: &70179448305180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126851370780
+  version_requirements: *70179448305180
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70126851369700 !ruby/object:Gem::Requirement
+  requirement: &70179448304120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70126851369700
+  version_requirements: *70179448304120
 description: I deploy and manage AWS resources.
 email:
 - brett@weav.net
@@ -82,6 +82,7 @@ files:
 - lib/composer/verify/name.rb
 - lib/composer/verify/region.rb
 - lib/composer/verify/ruby.rb
+- lib/composer/verify/secret.rb
 - lib/composer/version.rb
 - spec/compose_spec.rb
 - spec/spec_helper.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2198825478262304062
+      hash: -3287206967553428281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2198825478262304062
+      hash: -3287206967553428281
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16