jack_and_the_elastic_beanstalk 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cee55a57435fd7b4f30e21106eb18b460d9da7d
-  data.tar.gz: aa3e353b4617d1566afa2935716d8a13c1ab4be3
+  metadata.gz: 2c859193ef4fcd5f315210c2461e0708ff4545b4
+  data.tar.gz: '001108add4d437960bdd4012b0bda9b23f28f607'
 SHA512:
-  metadata.gz: cbdfe7b6367ad22caed35994f13e4ae1f88c881feee23a848601967fa1209bd1a57585c3e2a919ace52abd12174504ae8d385aa8f9339617211fb260f4fa4ac3
-  data.tar.gz: dcd7d6fc83fef3894cc0a2b125d5bd1c746432ec82ac37f9b85172cd1a098021394bcd3a59bf96f77f6ba2148a2ba0d436dd938648708a31a764f5123ad0f4d9
+  metadata.gz: bce386c64551de8ad07038f6aea5d077d14a1da6b5a010a904597ff84488934f593dee294358f0c4db6ae1712899673ed8704f45cd6a28e7578073856b7d6ced
+  data.tar.gz: 6588c39f356aba927aeb126fce7f874f1bf8bce6666a4449e9b59ba79f9c93f9c2ecc0142fe57e70a8c95ad9ef7ae29153b62f884183704289189a320e5bf056

data/lib/jack_and_the_elastic_beanstalk/cli.rb

@@ -236,6 +236,7 @@ module JackAndTheElasticBeanstalk
 
     desc "exec GROUP command...", "Run oneoff command"
     option :keep, type: :boolean, default: false, desc: "Keep started oneoff environment"
+    option :docker, type: :boolean, default: false, desc: "Run command in Docker container"
     def exec(group, *command)
       env = service.each_environment(group: group).find {|_, p| p == "oneoff" }&.first
       if env
@@ -269,7 +270,11 @@ module JackAndTheElasticBeanstalk
               sleep 15
             end
 
-            commandline = "cd /var/app/current && sudo -E -u webapp env PATH=$PATH #{command.join(' ')}"
+            commandline = if options[:docker]
+                            "sudo docker ps --filter=ancestor=aws_beanstalk/current-app --latest --format='{{.ID}}' | xargs -I{} sudo docker exec {} #{command.join(' ')}"
+                          else
+                            "cd /var/app/current && sudo -E -u webapp env PATH=$PATH #{command.join(' ')}"
+                          end
             out, err, status = runner.capture3 "eb", "ssh", env.environment_name, "-c", commandline
 
             runner.stdout.print out

data/lib/jack_and_the_elastic_beanstalk/service.rb

@@ -111,9 +111,15 @@ module JackAndTheElasticBeanstalk
     end
 
     def export_files(dest:)
-      files = runner.chdir(source_dir) do
-        runner.capture3!("git", "ls-files", "-z").first.split("\x0")
-      end
+      files = if (runner.pwd + '.git').exist?
+                runner.chdir(source_dir) do
+                  runner.capture3!("git", "ls-files", "-z").first.split("\x0")
+                end
+              else
+                Pathname.glob(source_dir + '**/*').select(&:file?).map do |path|
+                  path.to_s.sub(/\A#{source_dir}\//, '')
+                end
+              end
 
       files.each do |f|
         logger.debug("jeb::service") { "Copying #{f} ..."}

data/lib/jack_and_the_elastic_beanstalk/version.rb

@@ -1,3 +1,3 @@
 module JackAndTheElasticBeanstalk
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jack_and_the_elastic_beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler