fontana_client_support 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e0eaee551b52935db2ca937c66dfc967885e68
-  data.tar.gz: ee41bfa52d5daca6d1a95c83caca2e84c9f798ec
+  metadata.gz: 7af75a6d013efb9a724ee1d8441de8d32b16051f
+  data.tar.gz: 91e4f38c29d0fcea7be9fb71a2c778b94d686428
 SHA512:
-  metadata.gz: 834f2c77e2c8aad990b4927bc91db09245ab5c500831c310ca9674e97edf68dad2f8ca0553b14919f66a36be3aa14544d9e0dd673fe25214ca65dd24f715b240
-  data.tar.gz: 33833900e67a517676f7b52591723433ece9e31835d5f985d39568e0bb7ddc1fbeed19caf83e380967ac4fba51e2966531a90fb30649d9e2bb2c49893eff11cb
+  metadata.gz: abf62ca19207aef50433a567e3d011108bc39536ec53f9485892f195ddb751bbf7f378c818e616dcde0c8f2d3f1aca377f8c44c229834a741ce3b5988c822229
+  data.tar.gz: c6cff3ad9313a31e5e4fbf395860f22a663ea6b56b4a6a6394831075e57e2ef455f7036dcfb350a4de2f70a079d0c9be48b0a3e71244c2881d24264f0fca3b4a

data/lib/fontana/server_rake.rb

@@ -29,7 +29,7 @@ module Fontana
 
     def fontana_task(name, options = {})
       full_name = (@namespaces + [name]).join(':')
-      task name do
+      task(name => :"bundle:unset_env") do
         call_fontana_task(full_name, options)
       end
     end

data/lib/fontana_client_support/tasks/bundle.rake

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+require 'fontana_client_support'
+
+# http://bundler.io/v1.3/bundle_config.html
+namespace :bundle do
+
+  task :unset_env_bundle_environments do
+    targets = ENV.keys.select{|k| k =~ /\ABUNDLE_/}
+    targets.each{|t| ENV.delete(t) }
+  end
+
+  task :unset_env_gem_home do
+    ENV.delete("GEM_HOME")
+  end
+
+  task :unset_env => [:unset_env_bundle_environments, :unset_env_gem_home]
+
+end

data/lib/fontana_client_support/tasks/delayed_job.rake

@@ -32,7 +32,7 @@ end
       commands.each do |cmd, description|
 
         desc "@#{app_mode} #{description}"
-        task cmd do
+        task(cmd => :"bundle:unset_env") do
           s = "#{cmd_base} #{cmd}"
           options_str = ENV['OPTIONS']
           unless options_str.nil? || options_str.empty?

data/lib/fontana_client_support/tasks/server.rake

@@ -28,7 +28,7 @@ end
       https_env_str = build_env_str(https_env)
 
       # desc "update VersionSet entries' versions and copy collections"
-      task(:update_version_set_entries) do
+      task(:update_version_set_entries => :"bundle:unset_env") do
         if ENV["GSS_VERSION_SET_FIXTURE_FILEPATH"]
           system_at_vendor_fontana!(http_env_str + " rake version_set:update_entry_versions")
         end
@@ -49,7 +49,7 @@ end
         launch_https_server:        https_fg_cmd,
         launch_https_server_daemon: https_bg_cmd,
       }.each do |name, cmd|
-        task(name){ system_at_vendor_fontana!(cmd) }
+        task(name => :"bundle:unset_env"){ system_at_vendor_fontana!(cmd) }
       end
 
       task_sequential :launch_server_daemons, [
@@ -60,8 +60,8 @@ end
       ]
 
       spawn_env = {FONTANA_APP_MODE: app_mode, BUNDLE_GEMFILE: "Gemfile-LibgssTest" }
-      task(:spawn_http_server){ spawn_at_vendor_fontana_with_sweeper(http_env, http_base_cmd, out: "/dev/null") }
-      task(:spawn_https_server){ spawn_at_vendor_fontana_with_sweeper(https_env, https_base_cmd, out: "/dev/null") }
+      task(:spawn_http_server  => :"bundle:unset_env"){ spawn_at_vendor_fontana_with_sweeper(http_env , http_base_cmd , out: "/dev/null") }
+      task(:spawn_https_server => :"bundle:unset_env"){ spawn_at_vendor_fontana_with_sweeper(https_env, https_base_cmd, out: "/dev/null") }
 
       task_sequential :spawn_servers, [
         :"#{app_mode}:server:update_version_set_entries",

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -91,6 +91,8 @@ namespace :vendor do
 
     task :bundle_install do
       fileutils.chdir(FontanaClientSupport.vendor_fontana) do
+        # 開発環境での使用を想定しているので（ステージング、本番ではfontanaをデプロイするので）
+        # ここでは --path=vendor/bundle を指定しない
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
       end
     end
@@ -110,7 +112,7 @@ namespace :vendor do
       end
     end
 
-    task :db_drop do
+    task :db_drop => :"bundle:unset_env" do
       fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle exec rake db:drop")
       end

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - lib/fontana_client_support/tasks.rb
 - lib/fontana_client_support/tasks/app_mode.rake
 - lib/fontana_client_support/tasks/app_seed.rake
+- lib/fontana_client_support/tasks/bundle.rake
 - lib/fontana_client_support/tasks/config_server.rake
 - lib/fontana_client_support/tasks/db.rake
 - lib/fontana_client_support/tasks/delayed_job.rake