opsworks-deploy 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5939f9e0c6486f191a53017f878a64a5933aae16
-  data.tar.gz: 23df8ddd45c57e62fe927b9cbfbb4e876fc3d183
+  metadata.gz: 8500b0b3413c6604a04f213dc9d7ec9e4ba0fef2
+  data.tar.gz: 5f95eeac4a9db79e051d5373283fd1529818698f
 SHA512:
-  metadata.gz: 5e80fd5f36d9865f8b338ae0e11a4f1b4073ec84c986bc98e3610f320bc4416509caaf8085587d29f1c0e3846ae0cbfaa5c782517e90a6d9be526a04b39c4d22
-  data.tar.gz: 43aa67dd70cb0a85cf9292253674b3f6d56543e5c5c310067b914d5d66d9005a9a71d2c2190281d1dcedc8762e110e6e26a94925a5c6ffe512be02d9f2bb45f6
+  metadata.gz: 5e2cb3109791345ff674c786de567375526034cdd74b5d7721793187ffb8cd2bf5a736cdfe2f9ce7fb1ba2a8b6cb6b8dc446083dec6d57cb1c6a124fe78cb558
+  data.tar.gz: 5c3c8387db7972f806889db0d1e3e38f74d9780ed06beee6862c9771a2604d23002587ec8d5f79ecf05fe3aad0de7a0ccc8421d2e475c0736a32a31f65a79682

data/README.md

@@ -29,7 +29,7 @@ Or, if you would prefer to add items to config files:
 config/stacks.json
 
     {
-      "staging": { "stack_id": "...", "app_id": "..." }
+      "staging": { "stack_id": "...", "app_id": "...", "custom_json": {} }
     }
 
 ~/.aws_config
@@ -65,3 +65,7 @@ Use rspec for test
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Acknowledgements
+
+Thanks to @zacstewart for adding support for custom json.

data/lib/opsworks/deploy/deploy.rb

@@ -2,60 +2,9 @@ require "opsworks/deploy/version"
 require 'aws-sdk'
 
 module Opsworks::Deploy
-  
-  require 'opsworks/deploy/railtie' if defined?(Rails)    
-
-  def self.wait_on_deployment(deployment)
-    deployment_id = deployment.data[:deployment_id]
-    deployment_desc = nil
-
-    while true
-      deployment_desc = AWS.ops_works.client.describe_deployments(deployment_ids: [deployment_id])
-      
-      status = deployment_desc.data[:deployments].first[:status]
-
-      case status
-      when 'running'
-        sleep 10
-      when 'successful'
-        return true
-      else
-        raise "Failed to run deployment: #{deployment_id} - #{status}"
-      end
-    end
-
-    return true if deployment_desc.data[:status] == 'successful'
-  end
-
-  # Look for config/stacks.json or stacks.json
-  def self.get_config_stacks
-    cwd = Dir.getwd
-    files = ["#{cwd}/config/stacks.json","#{cwd}/stacks.json"]
-
-    if !cwd.nil? && cwd.length > 0
-      files.each do |file|
-        if File.exists?(file)
-          return JSON(File.read(file))
-        end
-      end
-    end
+  DEPLOYMENT_POLL_INTERVAL = 10
 
-    return nil
-  end
-
-  def self.get_stack(env=nil)
-    
-    # First try to get from env, then stack files
-    if !ENV['STACK_ID'].nil? && !ENV['APP_ID'].nil?
-      return {stack_id: ENV['STACK_ID'], app_id: ENV['APP_ID']}
-    elsif stacks = get_config_stacks
-      raise "Missing stacks configuration for #{env} in stacks.json" if stacks[env].nil?
-
-      return stacks[env]
-    else
-      raise "Must set STACK_ID and APP_ID or have config/stacks.json for env `#{env}`"
-    end
-  end
+  require 'opsworks/deploy/railtie' if defined?(Rails)
 
   def self.configure_aws!
     # First, try to pull these from the environment
@@ -72,28 +21,94 @@ module Opsworks::Deploy
     raise ArgumentError, "Must set IAM_KEY environment variable" if iam_key.nil? || iam_key.length == 0
     raise ArgumentError, "Must set IAM_SECRET environment variable" if iam_secret.nil? || iam_secret.length == 0
 
-    AWS.config({
-      access_key_id: iam_key,
-      secret_access_key: iam_secret,
-    })
+    AWS.config(access_key_id: iam_key, secret_access_key: iam_secret)
   end
 
   def self.deploy(opts={})
-    opts = {
-      migrate: true,
-      wait: false,
-      env: nil
-    }.merge(opts)
+    Opsworks::Deploy.configure_aws!
+    Deployment.new(opts).deploy
+  end
 
-    stack = Opsworks::Deploy.get_stack(opts[:env]) # Get stack environment
+  class Deployment
+    attr_reader :client, :deployment, :options
 
-    Opsworks::Deploy.configure_aws! # Ensure we are properly configured
-    
-    deployment = AWS.ops_works.client.create_deployment( stack_id: stack[:stack_id] || stack['stack_id'], app_id: stack[:app_id] || stack['app_id'], command: {name: 'deploy', args: {"migrate" => [ opts[:migrate] ? "true" : "false"] }} )
+    def initialize(options, client = AWS.ops_works.client)
+      @options = {
+        migrate: true,
+        wait: false,
+        env: nil
+      }.merge(options)
+      @client = client
+    end
+
+    def deploy
+      @deployment = client.create_deployment(arguments)
+      puts @deployment.inspect
+      wait_on_deployment if options[:wait]
+    end
 
-    puts deployment.inspect
+    private
 
-    Opsworks::Deploy.wait_on_deployment(deployment) if opts[:wait]
+    def arguments
+      {
+        stack_id: configuration['stack_id'],
+        app_id: configuration['app_id'],
+        command: command
+      }.tap do |args|
+        args[:custom_json] = custom_json if custom_json?
+      end
+    end
+
+    def command
+      {name: 'deploy', args: {'migrate' => [options[:migrate] ? 'true' : 'false']}}
+    end
+
+    def custom_json
+      configuration['custom_json'].to_json
+    end
+
+    def custom_json?
+      configuration.has_key?('custom_json')
+    end
+
+    def configuration
+      @configuration ||= if !ENV['STACK_ID'].nil? && !ENV['APP_ID'].nil?
+        {'stack_id' => ENV['STACK_ID'], 'app_id' => ENV['APP_ID']}
+      elsif stacks = configured_environments
+        stacks.fetch(environment) do
+          raise "Missing stacks configuration for #{environment} in stacks.json"
+        end
+      else
+        raise "Must set STACK_ID and APP_ID or have config/stacks.json for env `#{environment}`"
+      end
+    end
+
+    def environment
+      options.fetch(:env)
+    end
+
+    # Look for config/stacks.json or stacks.json
+    def configured_environments
+      files = Dir['config/stacks.json','stacks.json']
+      file = files.first and JSON.parse(File.read(file))
+    end
+
+    def wait_on_deployment
+      deployment_id = deployment.data[:deployment_id]
+      loop do
+        deployment_description = client.describe_deployments(
+            deployment_ids: [deployment_id]
+        )
+        status = deployment_description.data[:deployments].first[:status]
+
+        case status
+        when 'running' then sleep DEPLOYMENT_POLL_INTERVAL
+        when 'successful' then break
+        else
+          raise "Failed to run deployment: #{deployment_id} - #{status}"
+        end
+      end
+    end
   end
 
 end

data/lib/opsworks/deploy/version.rb

@@ -1,5 +1,5 @@
 module Opsworks
   module Deploy
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/opsworks-deploy.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Geoff Hayes"]
   spec.email         = ["hayesgm@gmail.com"]
   spec.description   = %q{Quick and easy rake task for deploying to AWS OpsWorks}
-  spec.summary       = %q{A quick rake task that will deploy to AWS OpsWorks.  This can be added as a post-step in Continuous Integration.  `rake opsworks:deply`}
+  spec.summary       = %q{A quick rake task that will deploy to AWS OpsWorks.  This can be added as a post-step in Continuous Integration.  `rake opsworks:deploy`}
   spec.homepage      = "https://github.com/hayesgm/opsworks-deploy"
   spec.license       = "MIT"
 
@@ -18,12 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'aws-sdk'
+  spec.add_runtime_dependency 'aws-sdk', '~> 1.62'
   spec.add_runtime_dependency 'json'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "json"
-  spec.add_development_dependency 'aws-sdk'
 end

data/spec/opsworks_deploy_spec.rb

@@ -46,7 +46,7 @@ describe 'opsworks:deploy rake task' do
       ENV['IAM_KEY'] = ENV['IAM_SECRET'] = "a"
 
       # Allow file config
-      expect(File).to receive(:exists?).and_return(true)
+      allow(Dir).to receive(:[]).and_return(['config/stacks.json'])
       expect(File).to receive(:read).and_return(config.to_json)
 
       expected_params = { stack_id: "sid", app_id: "aid", command: {name: 'deploy', args: {"migrate" => [ "false" ] } } }
@@ -81,7 +81,7 @@ describe 'opsworks:deploy rake task' do
       ENV['IAM_KEY'] = ENV['IAM_SECRET'] = "a"
 
       # Allow file config
-      expect(File).to receive(:exists?).and_return(true)
+      allow(Dir).to receive(:[]).and_return(['config/stacks.json'])
       expect(File).to receive(:read).and_return(config.to_json)
 
       expected_params = { stack_id: "sid", app_id: "aid", command: {name: 'deploy', args: {"migrate" => [ "true" ] } } }
@@ -103,4 +103,37 @@ describe 'opsworks:deploy rake task' do
     end
   end
 
-end
+  it "sets deploy's custom_json" do
+    config = {
+      'test-5' => {
+        'stack_id' => 'a_stack_id',
+        'app_id' => 'an_app_id',
+        'custom_json' => {'deploy' => {'appshortname' => {'database' => {'adapter' => 'postgresql'}}}}
+      }
+    }
+
+    ENV['IAM_KEY'] = 'an_iam_key'
+    ENV['IAM_SECRET'] = 'an_iam_secret'
+
+    allow(Dir).to receive(:[]).and_return(['config/stacks.json'])
+    expect(File).to receive(:read).and_return(config.to_json)
+    ops_works = double("ops_works")
+    client = double("client")
+    allow(AWS).to receive(:ops_works).and_return(ops_works)
+    allow(ops_works).to receive(:client).and_return(client)
+
+    expected_params = {
+      stack_id: 'a_stack_id',
+      app_id: 'an_app_id',
+      command: {name: 'deploy', args: {'migrate' => ['true']}},
+      custom_json: '{"deploy":{"appshortname":{"database":{"adapter":"postgresql"}}}}'
+    }
+
+    expect(client).to receive(:create_deployment).with(expected_params)
+    Rake::Task["opsworks:deploy"].invoke("test-5","true")
+
+    ENV.delete('IAM_KEY')
+    ENV.delete('IAM_SECRET')
+  end
+
+end

metadata

@@ -1,111 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Geoff Hayes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.62'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.62'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Quick and easy rake task for deploying to AWS OpsWorks
@@ -115,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,21 +112,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A quick rake task that will deploy to AWS OpsWorks.  This can be added as
-  a post-step in Continuous Integration.  `rake opsworks:deply`
+  a post-step in Continuous Integration.  `rake opsworks:deploy`
 test_files:
 - spec/opsworks_deploy_spec.rb
 - spec/spec_helper.rb