elastic-beanstalk 0.1.8 → 0.2.0

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 
-.idea
+.idea
+bin/eb.yml

data/bin/elastic-beanstalk

@@ -1,46 +1,25 @@
 #!/usr/bin/env ruby
-#$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-#
-#require 'rubygems'
-#require 'rake'
-#task=ARGV[0]
-#spec = Gem::Specification.find_by_name('elastic-beanstalk')
-#gem_dir = spec.gem_dir
-#puts gem_dir
-#
-#
-## testing only
-#gem_dir = "/Users/kross/alienfast/elastic-beanstalk"
-#puts gem_dir
-#
-#
-#Dir["#{gem_dir}/lib/elastic/beanstalk/tasks/*.rake"].each do |file|
-#  puts file and Rake::load_rakefile(file)
-#end
-#Rake::Task.clear # Avoid tasks being loaded several times in dev mode
-#Rake::Task[task].reenable # Support re-execution of a task.
-#Rake::Task[task].invoke
+require 'rake'
+require 'bundler'
+
+raise "Bundler is required.  Please install bundler with 'gem install bundler'" unless defined?(Bundler)
 
 #
 # Example:
 #
-#   elastic-beanstalk some-task
-#   elastic-beanstalk some-task[args]
+#   elastic-beanstalk eb:show_config
+#   elastic-beanstalk eb:show_config[1.1.1]
 #
 
-gem 'elastic-beanstalk'
+# init dependencies
+Bundler.setup
 
-gem_dir = File.expand_path('..',File.dirname(__FILE__))
-$LOAD_PATH.unshift gem_dir# Look in gem directory for resources first.
-
-require 'elastic-beanstalk'
-require 'rake'
-require 'pp'
-
-pwd=Dir.pwd
-Dir.chdir("#{gem_dir}/bin") # We'll load rakefile from the gem's bin dir.
+# init rake
 Rake.application.init
-Rake.application.load_rakefile
-Dir.chdir(pwd) # Revert to original pwd for any path args passed to task.
 
+# load the rake tasks
+gem_dir = File.expand_path('..',File.dirname(__FILE__))
+load "#{gem_dir}/lib/elastic/beanstalk/tasks/eb.rake"
+
+# invoke the given task
 Rake.application.invoke_task(ARGV[0])

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -3,8 +3,7 @@ require 'zipruby' # gem 'zipruby'
 require 'ap' # gem 'awesome_print'
 require 'eb_deployer'
 require 'time_diff'
-require 'elastic/beanstalk/config'
-require 'elastic/beanstalk/extensions'
+require 'elastic/beanstalk'
 require 'yaml'
 
 namespace :eb do
@@ -221,7 +220,7 @@ namespace :eb do
   def print_config
     # display helpful for figuring out problems later in the deployment logs.
     puts "\n----------------------------------------------------------------------------------"
-    puts "Elastic Beanstalk configuration:"
+    puts 'Elastic Beanstalk configuration:'
     puts "\t:access_key_id: #{credentials['access_key_id']}"
 
     # pretty print things that will be useful to see in the deploy logs and omit clutter that usually doesn't cause us problems.
@@ -252,7 +251,7 @@ namespace :eb do
   # load from a user directory i.e. ~/.aws.acme.yml
   def credentials
     # load secrets from the user home directory
-    @credentials = YAML.safe_load_file(aws_secrets_file) if @credentials.nil?
+    @credentials = YAML::load_file(aws_secrets_file) if @credentials.nil?
     @credentials
   end
 

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '0.1.8'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,6 @@ description: ! '    The simplest way to configure and deploy an Elastic Beanstal
 email:
 - kevin.ross@alienfast.com
 executables:
-- Rakefile
 - elastic-beanstalk
 extensions: []
 extra_rdoc_files: []
@@ -157,7 +156,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/Rakefile
 - bin/elastic-beanstalk
 - elastic-beanstalk.gemspec
 - lib/deep_symbolize.rb
@@ -189,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -509865312273443585
+      hash: -1662769207315793080
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -509865312273443585
+      hash: -1662769207315793080
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/bin/Rakefile

@@ -1,5 +0,0 @@
-# rakefile for external binstubs execution
-gem_dir = File.expand_path('..',File.dirname(__FILE__))
-
-# load the rake tasks
-load "#{gem_dir}/lib/elastic/beanstalk/tasks/eb.rake"