opsworks-deploy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61313915a53e4d09653d4a85f855aa0b64fe1b49
-  data.tar.gz: 164c655fc62e206aed029f6f90dfca95852e272a
+  metadata.gz: 24dc7f0f3e5b457e1a50978e238da61496e5e82f
+  data.tar.gz: 019421049e24a5fdca62366e212a8097ab855ce4
 SHA512:
-  metadata.gz: 7e478814436ec0f4da0c9e916a1de527192e269d03d461bb26ae60fba938727ee553347b0062a251993d17e0f0d7252560c44f40b629993c97b97239eed8cd9a
-  data.tar.gz: 207e8744ccd98c836165ba51a16b1333dbbe1a3b7066e3a67221d110d8b595f27d538564087be98534f01d2c798cb54dbd838d696419db493ec9d8b22dab1957
+  metadata.gz: 39e9117976d50cef7805b2a581aa353db0c999de01daa34340cc0ce19d4f5b3fd239435e5b0230d51f0b352d36317ac29616a52b916c1581ff35de2ce8e6ecf8
+  data.tar.gz: bcbcc9d037a8a858236b9d97dd9052289000d3c9d63ebdda322b2dfd5113bab74f46250f542bc58d67272dbebfcb97276d8b40c09bcc7f9bb125d3b31d9b5495

data/README.md

@@ -39,10 +39,18 @@ config/stacks.json
 
 Then run:
 
-    RAILS_ENV=staging AWS_CONFIG_FILE=~/.aws_config rake opsworks:deploy
+    ENV=staging AWS_CONFIG_FILE=~/.aws_config rake opsworks:deploy
 
 Note, your IAM keys should only allow deploy access to OpsWorks, but you should never check them into source control.
 
+## Without Rails
+
+To use with other ruby applications, e.g. Sinatra, add the following line to your `Rakefile`:
+
+     require "opsworks/tasks"
+
+This will load the rake task like above.
+
 ## Testing
 
 Use rspec for test

data/lib/opsworks-deploy.rb

@@ -1 +1,3 @@
+require 'aws-sdk'
+require 'json'
 require 'opsworks/deploy/deploy'

data/lib/opsworks/deploy/deploy.rb

@@ -27,17 +27,33 @@ module Opsworks::Deploy
     return true if deployment_desc.data[:status] == 'successful'
   end
 
-  def self.get_stack(rails_env=nil)
+  # 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
+
+    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 defined?(Rails) && !rails_env.nil? && File.exists?("#{Rails.root}/config/stacks.json")
-      # Try to grab from .stack file
-      stacks = JSON(File.read("#{Rails.root}/config/stacks.json"))
-      raise "Missing stacks configuration for #{rails_env}" if stacks[rails_env].empty?
+    elsif stacks = get_config_stacks
+      raise "Missing stacks configuration for #{env} in stacks.json" if stacks[env].nil?
 
-      return stacks[rails_env]
+      return stacks[env]
     else
-      raise "Must set STACK_ID/APP_ID or have config/stacks.json for rails env `#{rails_env}`"
+      raise "Must set STACK_ID and APP_ID or have config/stacks.json for env `#{env}`"
     end
   end
 
@@ -66,14 +82,13 @@ module Opsworks::Deploy
     opts = {
       migrate: true,
       wait: false,
-      rails_env: nil
+      env: nil
     }.merge(opts)
 
-    stack = Opsworks::Deploy.get_stack(opts[:rails_env]) # Get stack environment
+    stack = Opsworks::Deploy.get_stack(opts[:env]) # Get stack environment
 
     Opsworks::Deploy.configure_aws! # Ensure we are properly configured
-    p opts
-    p stack
+    
     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"] }} )
 
     puts deployment.inspect

data/lib/opsworks/deploy/version.rb

@@ -1,5 +1,5 @@
 module Opsworks
   module Deploy
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/opsworks/tasks.rb

@@ -0,0 +1,9 @@
+# Loads opsworks-deploy tasks from non-Rails application
+
+# See: http://pivotallabs.com/how-i-test-rake-tasks/
+# See: http://stackoverflow.com/questions/15446153/ruby-rake-load-tasks-from-a-gem
+# See: http://stackoverflow.com/questions/5458134/how-do-i-import-rake-tasks-from-a-gem-when-using-sinatra
+require File.join(File.dirname(__FILE__), '../opsworks-deploy')
+
+spec = Gem::Specification.find_by_name 'opsworks-deploy'
+load "#{spec.gem_dir}/lib/opsworks/tasks/opsworks.rake"

data/lib/opsworks/tasks/opsworks.rake

@@ -2,15 +2,15 @@
 namespace :opsworks do
 
   desc 'Deploy to Opsworks'
-  task :deploy, [:rails_env,:migrate] => :environment do |t, args|
-    rails_env = args[:rails_env] || ENV['RAILS_ENV']
+  task :deploy, [:env,:migrate] => [] do |t, args|
+    env = args[:env] || ENV['ENV'] || ENV['RAILS_ENV']
     migrate = args[:migrate] == "true" || args[:migrate] == "t"
 
-    raise ArgumentError, "Please pass rails_env as argument or set RAILS_ENV environment var" if rails_env.nil? || rails_env == ""
+    raise ArgumentError, "Please pass env as argument or set ENV or RAILS_ENV environment var" if env.nil? || env == ""
     
-    puts "Deploying #{rails_env}#{migrate ? " and running migrations" : ""}..."
+    puts "Deploying #{env}#{migrate ? " and running migrations" : ""}..."
 
-    Opsworks::Deploy.deploy(rails_env: rails_env, migrate: migrate)
+    Opsworks::Deploy.deploy(env: env, migrate: migrate)
 
     puts "Finished successfully"
   end

data/opsworks-deploy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   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.homepage      = ""
+  spec.homepage      = "https://github.com/hayesgm/opsworks-deploy"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/opsworks_deploy_spec.rb

@@ -7,7 +7,6 @@ describe 'opsworks:deploy rake task' do
 
   before(:all) do
     load File.expand_path("../../lib/opsworks/tasks/opsworks.rake", __FILE__)
-    Rake::Task.define_task(:environment)
   end
 
   after(:each) do
@@ -15,14 +14,14 @@ describe 'opsworks:deploy rake task' do
   end
 
   it "should call invoke with argument when given arg" do
-    expect(Opsworks::Deploy).to receive(:deploy).with(rails_env: 'test-1', migrate: false)
+    expect(Opsworks::Deploy).to receive(:deploy).with(env: 'test-1', migrate: false)
     Rake::Task["opsworks:deploy"].invoke('test-1')
   end
 
   it "should call invoke with argument when given env" do
     begin
       ENV['RAILS_ENV'] = "test-2"
-      expect(Opsworks::Deploy).to receive(:deploy).with(rails_env: 'test-2', migrate: false)
+      expect(Opsworks::Deploy).to receive(:deploy).with(env: 'test-2', migrate: false)
       Rake::Task["opsworks:deploy"].invoke
     ensure
       ENV['RAILS_ENV'] = nil
@@ -43,12 +42,10 @@ describe 'opsworks:deploy rake task' do
       }
 
       # Mock ENV vars
-      ENV['RAILS_ENV'] = "test-3"
+      ENV['ENV'] = "test-3"
       ENV['IAM_KEY'] = ENV['IAM_SECRET'] = "a"
 
-      # Allow rails-generated config
-      Rails = double("rails")
-      expect(Rails).to receive(:root).and_return(".").twice
+      # Allow file config
       expect(File).to receive(:exists?).and_return(true)
       expect(File).to receive(:read).and_return(config.to_json)
 
@@ -67,7 +64,7 @@ describe 'opsworks:deploy rake task' do
       # Call rake task
       Rake::Task["opsworks:deploy"].invoke
     ensure # clear ENV vars
-      ENV['RAILS_ENV'] = ENV['IAM_KEY'] = ENV['IAM_SECRET'] = nil
+      ENV['ENV'] = ENV['IAM_KEY'] = ENV['IAM_SECRET'] = nil
     end
   end
 
@@ -83,9 +80,7 @@ describe 'opsworks:deploy rake task' do
       # Mock ENV vars
       ENV['IAM_KEY'] = ENV['IAM_SECRET'] = "a"
 
-      # Allow rails-generated config
-      Rails = double("rails")
-      expect(Rails).to receive(:root).and_return(".").twice
+      # Allow file config
       expect(File).to receive(:exists?).and_return(true)
       expect(File).to receive(:read).and_return(config.to_json)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Geoff Hayes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -111,11 +111,12 @@ files:
 - lib/opsworks/deploy/deploy.rb
 - lib/opsworks/deploy/railtie.rb
 - lib/opsworks/deploy/version.rb
+- lib/opsworks/tasks.rb
 - lib/opsworks/tasks/opsworks.rake
 - opsworks-deploy.gemspec
 - spec/opsworks_deploy_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/hayesgm/opsworks-deploy
 licenses:
 - MIT
 metadata: {}
@@ -143,3 +144,4 @@ summary: A quick rake task that will deploy to AWS OpsWorks.  This can be added
 test_files:
 - spec/opsworks_deploy_spec.rb
 - spec/spec_helper.rb
+has_rdoc: