hanzo 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf18b51a540cd3579bf82622bfd45fc4f034449
-  data.tar.gz: af91b4057463254d56c85702720fd50e7c99148c
+  metadata.gz: 95dcbdcf0dc439565c0e0e11fd23bbebb0af3019
+  data.tar.gz: 4a3d79e25f7504b737e2bf040f3c7a04573b7381
 SHA512:
-  metadata.gz: 98700c6b8a43094637a57ba492730ba12894e213ec6cd59b30b1f6ee40d8823ad23a968147b9ecfb5e7687bad8c78cfb064a07332429b82e1d00140311f9a0d1
-  data.tar.gz: a0ddffdf1bac4fd26f7b6cb618f887a60ef25ef70238d492777448f4e1d8bfc3183e0b09e094c752b53cb51aec0c571573cd4b75f12b8b8f0f3594a22e63d615
+  metadata.gz: 84e4637277a29e7522827dcfeeb6618579c4674990aa1fab55237e8f6d651470663306f125f41ffe31eae2cc986dc5445dd221ad5180532347114f0324bba0bf
+  data.tar.gz: 3b21fad59f6a83a2f36c2a877526a2dca37ef7661b41b58c5b7afdec262e8ae836ff7dc66a94e2e83bfadc92561a8fa2a05b808f3ee9f3df21a0210a1cfd200b

data/.travis.yml

@@ -1,8 +1,10 @@
+sudo: false
+
 language: ruby
 
 rvm:
-  - 2.1.2
-  - 2.0.0
-  - 1.9.3
+  - 2.2
+  - 2.1
+  - 2.0
 
 script: "echo 'DO IT' && bundle exec rake spec"

data/lib/hanzo/base.rb

@@ -1,5 +1,6 @@
 module Hanzo
   class Base
+    # Accessors
     attr_accessor :options
 
     def initialize(args)

data/lib/hanzo/modules/deploy.rb

@@ -1,8 +1,15 @@
 module Hanzo
   class Deploy < Base
+    # Classes
     UnknownEnvironment = Class.new(StandardError)
     UninstalledEnvironment = Class.new(StandardError)
 
+    # Constants
+    MIGRATION_COMMANDS = {
+      'db/migrate' => 'rake db:migrate',
+      'priv/repo/migrations' => 'mix ecto.migrate'
+    }
+
   protected
 
     def initialize_variables
@@ -42,10 +49,10 @@ module Hanzo
     end
 
     def run_migrations
-      return unless Dir.exist?('db/migrate')
-      return unless Hanzo.agree('Run migrations?')
+      return if migration_directory.nil?
+      return unless Hanzo.agree('Run database migrations?')
 
-      Hanzo.run "heroku run rake db:migrate --remote #{@env}"
+      Hanzo.run "heroku run #{migration_command} --remote #{@env}"
       Hanzo.run "heroku ps:restart --remote #{@env}"
     end
 
@@ -57,5 +64,13 @@ module Hanzo
     def fetcher
       @fetcher ||= Hanzo::Fetchers::Environment.new(@env)
     end
+
+    def migration_directory
+      MIGRATION_COMMANDS.keys.find { |directory| Dir.exist?(directory) }
+    end
+
+    def migration_command
+      MIGRATION_COMMANDS[migration_directory]
+    end
   end
 end

data/lib/hanzo/modules/install.rb

@@ -3,6 +3,7 @@ require 'hanzo/modules/installers/labs'
 
 module Hanzo
   class Install < Base
+    # Mixins
     include Hanzo::Installers::Remotes
     include Hanzo::Installers::Labs
 

data/lib/hanzo/version.rb

@@ -1,3 +1,3 @@
 module Hanzo
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/cli/deploy_spec.rb

@@ -8,7 +8,7 @@ describe Hanzo::CLI do
     let(:heroku_remotes) { { 'production' => 'heroku-app-production' } }
     let(:migration_dir) { 'db/migrate' }
 
-    let(:migration_question) { 'Run migrations?' }
+    let(:migration_question) { 'Run database migrations?' }
     let(:deploy_question) { "Branch to deploy in #{env}:" }
 
     let(:migration_cmd) { "heroku run rake db:migrate --remote #{env}" }
@@ -25,7 +25,7 @@ describe Hanzo::CLI do
       let(:deploy_result) { true }
 
       before do
-        expect(Dir).to receive(:exist?).with(migration_dir).and_return(migrations_exist)
+        expect(Dir).to receive(:exist?).with(instance_of(String)).at_least(:once).and_return(migrations_exist)
         expect(Hanzo).to receive(:ask).with(deploy_question).and_return(branch)
         expect(Hanzo).to receive(:run).with(deploy_cmd).once.and_return(deploy_result)
       end
@@ -47,7 +47,7 @@ describe Hanzo::CLI do
         let(:deploy_result) { true }
 
         before do
-          expect(Dir).to receive(:exist?).with(migration_dir).and_return(migrations_exist)
+          expect(Dir).to receive(:exist?).with(instance_of(String)).at_least(:once).and_return(migrations_exist)
         end
 
         context 'and migrations that should be ran' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanzo
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Samuel Garneau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Hanzo is a tool to handle deployments in multiple environments on Heroku.