deploku 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94142cab90a94a372fec9dce8e2549e43aa3a7d9
-  data.tar.gz: 46f520ffcd139aab148bcb917ac75269d5d38731
+  metadata.gz: f66e41e5f13aa5aae9cc5db54d8a3e1d99132fd0
+  data.tar.gz: 9ab0c6aeb7aa1a8c598321466eaac0c1d751b316
 SHA512:
-  metadata.gz: fd88b61935cd42c4ab6c801cb8aa32d3f38d499297c436a1e5139c2d4d30efc3a245d4fd5d429d594749b54a055b97eb5a59c1d9e38787b7e902013e5419c233
-  data.tar.gz: 4544a6a914d3548d00e2123f61757f70dffc03e646fe2ad71f37cb3fc9218c0fbd84bcb3a3da661eb02da4dadd3ecd720efaa02d0c7e077bec5ffb389cbc9970
+  metadata.gz: da9940536231252b567d946e6ce4c811451669d8568d15090e9493aba0e4f44a7d8e1e2e1153c6d60143539d5e80e5172bafbe3fe9aa116c01b7ac0f06621423
+  data.tar.gz: 9e5490986ff92e315f1aa13d86498ca26f4df35934a7e5468f942d3abf567dfad4ce36796c396b78f8efee7c3d632f3b2d038dda29d79b5baeb41c4355f2a2a1

data/lib/deploku/remote.rb

@@ -10,7 +10,7 @@ module Deploku
     end
 
     def app_name
-      @app_name ||= run_command("git remote -v | grep #{remote} | grep push").match(/heroku\.com:(.*)\.git/)[1]
+      @app_name ||= run_command("git remote -v | grep #{remote} | grep push").match(/heroku[^:]*:(.*)\.git/)[1]
     end
 
     def remote_commit_exists_locally?
@@ -20,7 +20,7 @@ module Deploku
 
     def database_configured?
       return @database_configured if defined? @database_configured
-      @database_configured = test_command("rake db:migrate:status")
+      @database_configured = test_command("bundle exec rake db:migrate:status")
     end
 
     def behind
@@ -91,17 +91,26 @@ module Deploku
       deploy_commands.each_with_index do |command, index|
         puts "  #{index + 1}. #{command}"
       end
-      print "\nProceed? (y/N): "
-      proceed = STDIN.gets.strip
-      if proceed == "y"
-        puts ""
-        deploy_commands.each_with_index do |command, index|
-          puts "  #{index + 1}. #{command} ..."
-          run_command command
+      repeat = true
+      while repeat
+        repeat = false
+        print "\nChoose:\nD = deploy, or\nL = list commits to deploy, or\nanything else to abort: "
+        proceed = STDIN.getch.upcase
+        puts proceed
+        if proceed == "D"
+          puts ""
+          deploy_commands.each_with_index do |command, index|
+            puts "  #{index + 1}. #{command} ..."
+            run_command command
+          end
+          puts
+        elsif proceed == "L"
+          puts "\nList of commits between #{remote_commit.slice(0, 7)} and local branch\n"
+          run_command "git log --oneline #{remote_commit}..", :echo
+          repeat = true
+        else
+          puts "Abort"
         end
-        puts
-      else
-        puts "Abort"
       end
     end
 
@@ -161,7 +170,7 @@ module Deploku
     end
 
     def local_migrations
-      @local_migrations ||= extract_migrations(run_command("rake db:migrate:status"), :local)
+      @local_migrations ||= extract_migrations(run_command("bundle exec rake db:migrate:status"), :local)
     end
 
     def remote_migrations
@@ -184,4 +193,4 @@ module Deploku
 
   end
 
-end
+end

data/lib/deploku/runnable.rb

@@ -1,10 +1,13 @@
 module Deploku
   module Runnable
 
-    def run_command(command)
+    def run_command(command, option = nil)
       Bundler.with_clean_env {
         out = `#{command}`
         if $?.success?
+          if option == :echo
+            puts out
+          end
           out
         else
           puts "Error running command:"

data/lib/deploku/version.rb

@@ -1,3 +1,3 @@
 module Deploku
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploku
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Bill Horsman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler