simple_deploy 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.4.1:
+
+* Added notifier class and campfire notifications
+* Added primary host env to deployment command
+* Upgraded to stackster v0.2.8
+
 ## v0.4.0:
 
 * Added support for passing updates with deploy command

data/README.md

@@ -27,6 +27,10 @@ environments:
     access_key: XXX
     secret_key: yyy
     region: us-west-1
+
+notifications:
+  campfire:
+    token: XXX
 ```
 
 Configuration File

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+task :default => [:spec]
+
+desc 'Run specs'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(-fs --color)
+end

data/lib/simple_deploy/cli/deploy.rb

@@ -22,23 +22,29 @@ EOS
                                                                   :default => 'info'
           opt :name, "Stack name(s) of stack to deploy", :type => :string,
                                                          :multi => true
+          opt :quiet, "Quiet, do not send notifications"
         end
 
         CLI::Shared.valid_options? :provided => opts,
                                    :required => [:environment, :name]
 
-        config = Config.new.environment opts[:environment]
         logger = SimpleDeployLogger.new :log_level => opts[:log_level]
 
-        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
-                                                  :logger     => logger
+        new_attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
+                                                      :logger     => logger
         opts[:name].each do |name|
+          notifier = Notifier.new :stack_name  => name,
+                                  :environment => opts[:environment],
+                                  :logger      => logger
+
           stack = Stack.new :environment => opts[:environment],
                             :name        => name,
-                            :config      => config,
                             :logger      => logger
-          stack.update(:attributes => attributes) if attributes.any?
+
+          stack.update(:attributes => new_attributes) if new_attributes.any?
           stack.deploy opts[:force]
+
+          notifier.send_deployment_complete_message unless opts[:quiet]
         end
       end
     end

data/lib/simple_deploy/cli.rb

@@ -22,11 +22,6 @@ module SimpleDeploy
     def self.start
       cmd = ARGV.shift
 
-      unless cmd
-        puts "\nPlease specify a command.\n"
-        exit 1
-      end
-
       case cmd
       when 'attributes'
         CLI::Attributes.new.show
@@ -59,12 +54,13 @@ module SimpleDeploy
       when 'update'
         CLI::Update.new.update
       when '-h'
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update]"
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update]"
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
+        exit 1
       end
     end
 

data/lib/simple_deploy/config.rb

@@ -47,6 +47,10 @@ module SimpleDeploy
       environments[name]
     end
 
+    def notifications
+      config['notifications']
+    end
+
     def region(name)
       environment(name)['region']
     end

data/lib/simple_deploy/logger.rb

@@ -1,40 +1,31 @@
 module SimpleDeploy
   class SimpleDeployLogger
-    
+
+    require 'forwardable'
+
+    extend Forwardable
+
+    def_delegators :@logger, :debug, :error, :info, :warn
+
     def initialize(args = {})
-      @logger = args[:logger] ||= Logger.new(STDOUT)
       @log_level = args[:log_level] ||= 'info'
+      @logger    = args[:logger] ||= new_logger(args)
+    end
 
-      unless args[:logger]
-        @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        @logger.formatter = proc do |severity, datetime, progname, msg|
-            "#{datetime}: #{msg}\n"
+    private
+    def new_logger(args)
+      Logger.new(STDOUT).tap do |l|
+        l.datetime_format = '%Y-%m-%dT%H:%M:%S%z'
+        l.formatter = proc do |severity, datetime, progname, msg|
+          "#{datetime} #{severity} : #{msg}\n"
         end
+        l.level = logger_level
       end
-
-      case @log_level.downcase
-      when 'info'
-        @logger.level = Logger::INFO
-      when 'debug'
-        @logger.level = Logger::DEBUG
-      when 'warn'
-        @logger.level = Logger::WARN
-      when 'error'
-        @logger.level = Logger::ERROR
-      end
-      @logger
     end
 
-    def debug(msg)
-      @logger.debug msg
+    def logger_level
+      Logger.const_get @log_level.upcase
     end
 
-    def info(msg)
-      @logger.info msg
-    end
-
-    def error(msg)
-      @logger.error msg
-    end
   end
 end

data/lib/simple_deploy/notifier/campfire.rb

@@ -0,0 +1,41 @@
+require 'tinder'
+
+module SimpleDeploy
+  class Notifier
+    class Campfire
+
+      def initialize(args)
+        @stack_name = args[:stack_name]
+        @environment = args[:environment]
+        @config = args[:config]
+        @logger = @config.logger
+
+        attributes = stack.attributes
+        @subdomain = attributes['campfire_subdomain']
+        @room_ids = attributes['campfire_room_ids'] ||= ''
+        @logger.debug "Campfire subdomain '#{@subdomain}'."
+        @logger.debug "Campfire room ids '#{@room_ids}'."
+        @token = @config.notifications['campfire']['token']
+        @campfire = Tinder::Campfire.new @subdomain, :token => @token
+      end
+
+      def send(message)
+        @room_ids.split(',').each do |room_id|
+          @logger.debug "Sending notification to Campfire room #{room_id}."
+          room = @campfire.find_room_by_id room_id.to_i
+          room.speak message
+        end
+        @logger.debug "Campfire notifications complete."
+      end
+
+      private
+
+      def stack
+        @stack ||= Stackster::Stack.new :environment => @environment,
+                                        :name        => @stack_name,
+                                        :config      => @config.environment(@environment),
+                                        :logger      => @logger
+      end
+    end
+  end
+end

data/lib/simple_deploy/notifier.rb

@@ -0,0 +1,50 @@
+require 'simple_deploy/notifier/campfire'
+
+module SimpleDeploy
+  class Notifier
+    def initialize(args)
+      @stack_name = args[:stack_name]
+      @environment = args[:environment]
+      @config = Config.new :logger => args[:logger]
+      @logger = @config.logger
+      @notifications = @config.notifications
+    end
+
+    def send_deployment_complete_message
+      message = "Deployment to #{@stack_name} complete."
+      attributes = stack.attributes
+
+      if attributes['app_github_url']
+        message += " App: #{attributes['app_github_url']}/commit/#{attributes['app']}"
+      end
+
+      if attributes['chef_repo_github_url']
+        message += " Chef: #{attributes['chef_repo_github_url']}/commit/#{attributes['chef_repo']}"
+      end
+
+      send message
+    end
+
+    def send(message)
+      @notifications.keys.each do |notification|
+        case notification
+        when 'campfire'
+          campfire = Notifier::Campfire.new :stack_name  => @stack_name,
+                                            :environment => @environment,
+                                            :config      => @config
+          campfire.send message
+        end
+      end
+    end
+
+    private
+
+    def stack
+      @stack ||= Stackster::Stack.new :environment => @environment,
+                                      :name        => @stack_name,
+                                      :config      => @config.environment(@environment),
+                                      :logger      => @logger
+    end
+
+  end
+end

data/lib/simple_deploy/stack/deployment.rb

@@ -40,7 +40,7 @@ module SimpleDeploy
         get_artifact_endpoints.each_pair do |k,v|
           cmd += "#{k}=#{v} "
         end
-        cmd += "PRIMARY=#{primary_instance} "
+        cmd += "PRIMARY_HOST=#{primary_instance} "
         cmd += @deploy_script
 
         @logger.info "Executing '#{cmd}.'"

data/lib/simple_deploy/stack/stack_reader.rb

@@ -1,4 +1,5 @@
 require 'json'
+
 module SimpleDeploy
   class StackReader
 

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/simple_deploy.rb

@@ -1,5 +1,6 @@
 require 'simple_deploy/config'
 require 'simple_deploy/artifact'
 require 'simple_deploy/stack'
+require 'simple_deploy/notifier'
 require 'simple_deploy/logger'
 require 'simple_deploy/version'

data/simple_deploy.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "stackster", '= 0.2.7'
+  s.add_runtime_dependency "stackster", '= 0.2.8'
+  s.add_runtime_dependency "tinder"
   s.add_runtime_dependency "trollop"
 end

data/spec/config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Config do
+describe SimpleDeploy do
 
   it "should create a new config object" do
     config = SimpleDeploy::Config.new

data/spec/notifier/campfire_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  describe "with all required configurations" do
+    before do
+      config = { 'campfire' => { 'token' => 'tkn' } }
+                
+      @config_mock = mock 'config mock'
+      @stack_mock = mock 'stack'
+      @logger_mock = mock 'logger mock'
+      @tinder_mock = mock 'tinder'
+      @config_mock.should_receive(:logger).and_return @logger_mock
+      @config_mock.should_receive(:notifications).and_return config
+      @config_mock.should_receive(:environment).and_return 'env_config'
+      Stackster::Stack.should_receive(:new).
+                       with(:environment => 'test',
+                            :name        => 'stack_name',
+                            :config      => 'env_config',
+                            :logger      => @logger_mock).
+                       and_return @stack_mock
+
+      Tinder::Campfire.should_receive(:new).
+                       with('subdom', :token => 'tkn').and_return @tinder_mock
+      @stack_mock.should_receive(:attributes).
+                  and_return( 'campfire_room_ids'  => '1,2',
+                              'campfire_subdomain' => 'subdom' )
+      @logger_mock.should_receive(:debug).
+                   with "Campfire subdomain 'subdom'."
+      @logger_mock.should_receive(:debug).
+                   with "Campfire room ids '1,2'."
+      @campfire = SimpleDeploy::Notifier::Campfire.new :stack_name  => 'stack_name',
+                                                       :environment => 'test',
+                                                       :config      => @config_mock
+
+    end
+
+    it "should send a message to campfire rooms" do
+      room1_mock = mock 'tinder'
+      room2_mock = mock 'tinder'
+      @tinder_mock.should_receive(:find_room_by_id).with(1).
+                                                    and_return room1_mock
+      @tinder_mock.should_receive(:find_room_by_id).with(2).
+                                                    and_return room2_mock
+      @logger_mock.should_receive(:debug).
+                   with "Sending notification to Campfire room 1."
+      @logger_mock.should_receive(:debug).
+                   with "Sending notification to Campfire room 2."
+      @logger_mock.should_receive(:debug).
+                   with "Campfire notifications complete."
+      room1_mock.should_receive(:speak).with :message => "heh you guys!"
+      room2_mock.should_receive(:speak).with :message => "heh you guys!"
+      @campfire.send(:message => 'heh you guys!')
+    end
+  end
+
+  describe "without valid attributes" do
+    before do
+      config = { 'campfire' => { 'token' => 'tkn' } }
+                
+      @config_mock = mock 'config mock'
+      @stack_mock = mock 'stack'
+      @logger_mock = mock 'logger mock'
+      @tinder_mock = mock 'tinder'
+      @config_mock.should_receive(:logger).and_return @logger_mock
+      @config_mock.should_receive(:notifications).and_return config
+      @config_mock.should_receive(:environment).and_return 'env_config'
+      Stackster::Stack.should_receive(:new).
+                       with(:environment => 'test',
+                            :name        => 'stack_name',
+                            :config      => 'env_config',
+                            :logger      => @logger_mock).
+                       and_return @stack_mock
+
+      Tinder::Campfire.should_receive(:new).
+                       with(nil, :token => 'tkn').and_return @tinder_mock
+      @stack_mock.should_receive(:attributes).
+                  and_return({})
+      @logger_mock.should_receive(:debug).
+                   with "Campfire subdomain ''."
+      @logger_mock.should_receive(:debug).
+                   with "Campfire room ids ''."
+      @logger_mock.should_receive(:debug).
+                   with "Campfire notifications complete."
+      @campfire = SimpleDeploy::Notifier::Campfire.new :stack_name  => 'stack_name',
+                                                       :environment => 'test',
+                                                       :config      => @config_mock
+    end
+
+    it "should not blow up if campfire_subdom & campfire_room_ids are not present" do
+      @campfire.send(:message => 'heh you guys!')
+    end
+  end
+
+end
+

data/spec/notifier_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  before do
+    @config_mock = mock 'config mock'
+    @logger_mock = mock 'logger mock'
+    SimpleDeploy::Config.should_receive(:new).
+                         with(:logger => @logger_mock).
+                         and_return @config_mock
+                 
+    @config_mock.should_receive(:notifications).
+                 and_return({ 'campfire' => 'settings' })
+    @config_mock.should_receive(:logger).
+                 and_return @logger_mock
+    @notifier = SimpleDeploy::Notifier.new :stack_name  => 'stack_name',
+                                           :environment => 'test',
+                                           :logger      => @logger_mock
+  end
+
+  it "should include the github app & chef links if attributes present" do
+    stack_mock = mock 'stack'
+    campfire_mock = mock 'campfire mock'
+    environment_mock = mock 'environment mock'
+    @config_mock.should_receive(:environment).
+                 with('test').
+                 and_return environment_mock
+    Stackster::Stack.should_receive(:new).
+                     with(:environment => 'test',
+                          :name        => 'stack_name',
+                          :config      => environment_mock,
+                          :logger      => @logger_mock).
+                     and_return stack_mock
+    stack_mock.should_receive(:attributes).
+               and_return({ 'app_github_url'       => 'http://github.com/user/app',
+                            'chef_repo_github_url' => 'http://github.com/user/chef_repo',
+                            'app'                  => 'appsha',
+                            'chef_repo'            => 'chefsha' })
+    SimpleDeploy::Notifier::Campfire.should_receive(:new).
+                                     and_return campfire_mock
+    campfire_mock.should_receive(:send).
+                  with "Deployment to stack_name complete. App: http://github.com/user/app/commit/appsha Chef: http://github.com/user/chef_repo/commit/chefsha"
+    @notifier.send_deployment_complete_message
+  end
+
+  it "should send a message to each listed notification endpoint" do
+    campfire_mock = mock 'campfire mock'
+    SimpleDeploy::Notifier::Campfire.should_receive(:new).
+                                     with(:environment => 'test',
+                                          :stack_name  => 'stack_name',
+                                          :config      => @config_mock).
+                                     and_return campfire_mock
+    campfire_mock.should_receive(:send).with 'heh you guys!'
+    @notifier.send 'heh you guys!'
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70136111742480 !ruby/object:Gem::Requirement
+  requirement: &70145775467200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136111742480
+  version_requirements: *70145775467200
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70136111740700 !ruby/object:Gem::Requirement
+  requirement: &70145775465720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136111740700
+  version_requirements: *70145775465720
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70136111738160 !ruby/object:Gem::Requirement
+  requirement: &70145775463980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70136111738160
+  version_requirements: *70145775463980
+- !ruby/object:Gem::Dependency
+  name: tinder
+  requirement: &70145775444140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70145775444140
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70136111737680 !ruby/object:Gem::Requirement
+  requirement: &70145775441180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136111737680
+  version_requirements: *70145775441180
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -91,6 +102,8 @@ files:
 - lib/simple_deploy/cli/update.rb
 - lib/simple_deploy/config.rb
 - lib/simple_deploy/logger.rb
+- lib/simple_deploy/notifier.rb
+- lib/simple_deploy/notifier/campfire.rb
 - lib/simple_deploy/stack.rb
 - lib/simple_deploy/stack/deployment.rb
 - lib/simple_deploy/stack/stack_attribute_formater.rb
@@ -100,6 +113,8 @@ files:
 - script/ci_setup
 - simple_deploy.gemspec
 - spec/config_spec.rb
+- spec/notifier/campfire_spec.rb
+- spec/notifier_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -115,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2716701710085273471
+      hash: 3053773763840016870
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2716701710085273471
+      hash: 3053773763840016870
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16
@@ -133,4 +148,6 @@ specification_version: 3
 summary: I help with deployments
 test_files:
 - spec/config_spec.rb
+- spec/notifier/campfire_spec.rb
+- spec/notifier_spec.rb
 - spec/spec_helper.rb