elastic-beanstalk 0.1.4 → 0.1.5

data/lib/elastic/beanstalk/config.rb

@@ -164,18 +164,12 @@ module Elastic
       end
 
       def resolve_path(relative_path)
-        if defined?(Rails)
 
-          #puts '**********************Using Rails.root'
+        if defined?(Rails)
           Rails.root.join(relative_path)
         elsif defined?(Rake.original_dir)
-
-          #puts '**********************Using Rake.original_dir'
           Rake.original_dir.join(relative_path)
         else
-
-          #puts '**********************Using Last resort Dir.pwd'
-          #raise 'I have no idea what the root dir is yet.'
           File.expand_path(relative_path, Dir.pwd)
         end
       end

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

@@ -67,7 +67,7 @@ namespace :eb do
   #   root of the archive, not under a top level folder.  Include this package task to make
   #   sure we don't need to learn about this again through long deploy cycles!
   #
-  desc 'Package zip source bundle for Elastic Beanstalk'
+  desc 'Package zip source bundle for Elastic Beanstalk and generate external Rakefile'
   task :package => [:clobber, :config] do |t, args|
 
     begin
@@ -109,7 +109,7 @@ namespace :eb do
 
       # write Rakefile for external CI/CD package deployment
       File.open(package_rakefile, "w+") do |f|
-        f.write("spec = Gem::Specification.find_by_name('elastic-beanstalk', '#{Elastic::Beanstalk::VERSION}')\n")
+        f.write("spec = Gem::Specification.find_by_name('elastic-beanstalk', '>= #{Elastic::Beanstalk::VERSION}')\n")
         f.write("load \"\#{spec.gem_dir}/lib/elastic/beanstalk/tasks/eb.rake\"")
       end
 
@@ -133,8 +133,10 @@ namespace :eb do
     # ensure credentials
     credentials!
 
+    package = resolve_absolute_package_file
+
     # check package file
-    raise "Package file not found (#{absolute_package_file}).  Be sure to run the :package task subsequent to any :deploy attempts." if !File.exists? absolute_package_file
+    raise "Package file not found #{package} (also checked current dir).  Be sure to run the :package task subsequent to any :deploy attempts." if !File.exists? package
 
     # Don't deploy to test or cucumber (or whatever is specified by :disallow_environments)
     raise "#{EbConfig.environment} is one of the #{EbConfig.disallow_environments} disallowed environments.  Configure it by changing the :disallow_environments in the eb.yml" if EbConfig.disallow_environments.include? EbConfig.environment
@@ -156,7 +158,7 @@ namespace :eb do
         solution_stack_name: EbConfig.solution_stack_name,
         settings: EbConfig.option_settings,
         strategy: EbConfig.strategy.to_sym,
-        package: absolute_package_file
+        package: package
     }
 
     unless EbConfig.smoke_test.nil?
@@ -252,8 +254,22 @@ namespace :eb do
     EbConfig.package[:verbose] || false
   end
 
+  def resolve_absolute_package_file
+
+    # first see if it is in the current dir, i.e. CI environment where the generated rakefile and pkg is dropped in the same place
+    file = EbConfig.resolve_path(package_file_name)
+    return file if File.exists? file
+
+    file = EbConfig.resolve_path(package_file)
+    return file
+  end
+
   def package_file
-    "#{EbConfig.package[:dir]}/#{EbConfig.app}.zip"
+    "#{EbConfig.package[:dir]}/#{package_file_name}"
+  end
+
+  def package_file_name
+    "#{EbConfig.app}.zip"
   end
 
   def package_rakefile
@@ -263,13 +279,4 @@ namespace :eb do
   def aws_secrets_file
     File.expand_path("~/.aws.#{EbConfig.app}.yml")
   end
-
-  def absolute_package_file
-    filename = package_file()
-    unless filename.start_with? '/'
-      filename = filename.gsub('[', '').gsub(']', '')
-      filename = EbConfig.resolve_path(filename)
-    end
-    filename
-  end
 end

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1603262801538237267
+      hash: 2377796499627488334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1603262801538237267
+      hash: 2377796499627488334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25