ridgepole_rake 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c68dd06835e80864a9858a4eaeb2f6cca07b5d
-  data.tar.gz: a35c39cfb472d1a0d5ec6f85f5a7cdd2b4353b77
+  metadata.gz: 9f178fd2e48d399b284b2f236e6f2af0cd9d343d
+  data.tar.gz: 2f185be4c5ce194d2ad91da404d616b4f5eb2ba3
 SHA512:
-  metadata.gz: 2b77841b3092c2ccf9f80526550d21473d847c91b5a6e91f7b45a8b3f4a1fef3d56ecc2c1f135f3ba4f27f32fcaa5ad14a3f598f916fad341547f04a91c82565
-  data.tar.gz: 3fd49e476a38f569a41273837c4525c61a6e9047a522e21bae7dd98e4b6076756e7208803040f4a42370aa58f941ff8d95b40338ee21f03e509b219cd82e0f3f
+  metadata.gz: dfd3ee108c3360f43bfc2fc614400c1998e093b59c67f53d462ee9c1fe65e95f27b92d2177b1d3ce3d5dbe6f63e8e974798af7630c75c2c980ca0851dd2524ff
+  data.tar.gz: 325a2720206e5b5c90cf317d7dbbd973d769889e4b1973767040cbd649b559470376270013b51ece860cc0c840cbec2d0a34ebdafb91e293bfd0d6d7c2c2ea22

data/.travis.yml

@@ -3,19 +3,19 @@ sudo: required
 language: ruby
 matrix:
   include:
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       gemfile: gemfiles/Gemfile-minimum
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       gemfile: gemfiles/Gemfile-rails4-2
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       gemfile: gemfiles/Gemfile-rails5-0
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       gemfile: gemfiles/Gemfile-all-rails4-2
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       gemfile: gemfiles/Gemfile-all-rails5-0
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       gemfile: gemfiles/Gemfile-rails5-0
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       gemfile: gemfiles/Gemfile-all-rails5-0
 cache:
   - bundler

data/README.md

@@ -162,6 +162,13 @@ RidgepoleRake.config.bundler
 
 If `RidgepoleRake.config.bundler[:use] == true` and `RidgepoleRake.config.bundler[:clean_system] == true`, Ridgepole will be performed using `Bundler.clean_system`.
 
+```ruby
+RidgepoleRake.config.bundler[:with_clean_env] = proc { ENV.update('FOO' => 'bar') }
+# => {"use"=>true, "clean_system"=>true, "with_clean_env"=>#<Proc:0x007f8711095818>}
+```
+
+If an object with a method named `call` is set in `RidgepoleRake.config.bundler[:with_clean_env]`, Ridgepole will be performed after calling the method named `call` of that object in `Bundler.with_clean_env` block.
+
 ## License
 
 MIT License

data/lib/ridgepole_rake.rb

@@ -9,19 +9,27 @@ require 'ridgepole_rake/command'
 require 'ridgepole_rake/tasks'
 require 'ridgepole_rake/version'
 
-%w(
-  rails
-  bundler
-  brancher
-).each do |extension|
-  begin
-    require extension
-    require "ridgepole_rake/ext/#{extension}"
-  rescue LoadError
-  end
+# Rails
+begin
+  require 'rails'
+  require 'ridgepole_rake/ext/rails'
+  require 'ridgepole_rake/railtie'
+rescue LoadError
+end
+
+#Bundler
+begin
+  require 'bundler'
+  require 'ridgepole_rake/ext/bundler'
+rescue LoadError
 end
 
-require 'ridgepole_rake/railtie' if defined?(Rails)
+# Brancher
+begin
+  require 'brancher'
+  require 'ridgepole_rake/ext/brancher'
+rescue LoadError
+end
 
 module RidgepoleRake
   extend self

data/lib/ridgepole_rake/ext/brancher.rb

@@ -27,7 +27,7 @@ module RidgepoleRake
       end
 
       def database_configuration
-        if config.brancher[:use] && (yaml = database_configuration_with_brancher rescue nil)
+        if config.brancher[:use] && (yaml = database_configuration_with_brancher)
           action.eql?(:diff) ? remove_first_line_in_yaml(yaml) : yaml
         else
           config.ridgepole.fetch(:config)
@@ -41,6 +41,8 @@ module RidgepoleRake
         ::Brancher::DatabaseRenameService.rename!(configurations, env)
 
         configurations[env].to_yaml
+      rescue
+        nil
       end
 
       def load_configurations

data/lib/ridgepole_rake/ext/bundler.rb

@@ -8,7 +8,7 @@ module RidgepoleRake
       # @note override
       def initialize
         super
-        @bundler = { use: true, clean_system: true }.with_indifferent_access
+        @bundler = { use: true, clean_system: true, with_clean_env: nil }.with_indifferent_access
       end
 
       def bundler=(hash)
@@ -19,7 +19,12 @@ module RidgepoleRake
     module Command
       # @note override
       def execute
-        if config.bundler[:use] && config.bundler[:clean_system]
+        if use_with_clean_env?
+          ::Bundler.with_clean_env do
+            config.bundler[:with_clean_env].call
+            super
+          end
+        elsif use_clean_system?
           ::Bundler.clean_system(*stash)
         else
           super
@@ -33,6 +38,14 @@ module RidgepoleRake
         super
         stash.unshift(*%w(bundle exec)) if config.bundler[:use]
       end
+
+      def use_with_clean_env?
+        config.bundler[:use] && config.bundler[:with_clean_env].respond_to?(:call)
+      end
+
+      def use_clean_system?
+        config.bundler[:use] && config.bundler[:clean_system]
+      end
     end
   end
 end

data/lib/ridgepole_rake/version.rb

@@ -1,3 +1,3 @@
 module RidgepoleRake
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole_rake
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - nalabjp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridgepole