fontana_client_support 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2E1MTVhODM4MGQyNzMxOWM2YmI1NTkyODhmYzU2MGExMTA2YWFjZQ==
-  data.tar.gz: !binary |-
-    NGYzYjAwMGMyMDcwZDAyYTA4NGYwODc5YThkNzNlZDIwZjAxMWZkMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGNjOTk0MzVlNmY2OTA3NTE5ZDJjZDlhOTg0ZTE0YWZjNjcyNDk5MzIxMmVk
-    ZDJkZGViNzZjOWE1ODJlMTU1MjU0MzY1NjIzYjgxNjk4MTNlMjkwMjRmNzI1
-    NTcwOTlhYThlNjc5NWRkMmQwYjAyZmIwY2E5OTBmYTY3OWMzMDQ=
-  data.tar.gz: !binary |-
-    MzkwMzY1YjE3YmRhMDIwODM3ZDNjYTI1M2QzMjc3OTY4NTY5MTk5MjQ1MmM0
-    MjQ2Y2NhMjA3NjE4Y2VlY2NiZTZiZDk0MWQ3ZDAzM2Q0OTM5NzgwMjVmZjVm
-    MDI3N2FmMjMwMzk1N2E0ZjlhNDZiNjkwN2NjOTFmMGMxNDhmMjQ=
+SHA1:
+  metadata.gz: 49906ba658f2721bddcc19a66daf1b1dc3a0008f
+  data.tar.gz: 8471d5f7dfd5d7be4ea5b16e57f08e3330c85a44
+SHA512:
+  metadata.gz: f06004dbb113bbcec556212815cfbcef3d6a1f310b2c0cf31666095f6f47bd7cb44651f20fa0066b561b97da12e0f82045780f238a1871c885aab5b7306db08d
+  data.tar.gz: 6ac36294c9f75bb744096a2f02408e6103d475c25f9262dd5fb2bb29c93ec712cd6f2815da1fc6fa7184e57067bb444864fab54a6f48879dddb73a59a6c92b67

data/lib/fontana/server_rake.rb

@@ -1,4 +1,5 @@
 require 'fontana'
+require 'fileutils'
 
 module Fontana
   module ServerRake
@@ -19,7 +20,7 @@ module Fontana
       if Rake.application.options.trace
         cmd << " --trace -v"
       end
-      Dir.chdir(Fontana.home) do
+      FileUtils::Verbose.chdir(Fontana.home) do
         system!(cmd)
       end
 

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -3,12 +3,16 @@ require 'fontana_client_support'
 include Fontana::ServerRake
 include Fontana::RakeUtils
 
+require 'fileutils'
+
 namespace :vendor do
   namespace :fontana do
 
+    fileutils = FileUtils::Verbose
+
     task :clear do
       d = FontanaClientSupport.vendor_fontana
-      FileUtils.rm_rf(d) if Dir.exist?(d)
+      fileutils.rm_rf(d) if Dir.exist?(d)
     end
 
     # 動的に決まるタスクを静的に扱えるようにタスクを定義します
@@ -28,32 +32,32 @@ namespace :vendor do
 
     task :clone do
       raise "$FONTANA_REPO_URL is required" unless Fontana.repo_url
-      FileUtils.mkdir_p(FontanaClientSupport.vendor_dir)
-      Dir.chdir(FontanaClientSupport.root_dir) do
+      fileutils.mkdir_p(FontanaClientSupport.vendor_dir)
+      fileutils.chdir(FontanaClientSupport.root_dir) do
         system!("git clone #{Fontana.repo_url} vendor/fontana")
       end
-      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+      fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git checkout #{Fontana.branch}")
       end
     end
 
     task :configs do
-      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+      fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         [
           File.join(FontanaClientSupport.root_dir, "config/fontana_mongoid.yml"),
           "config/mongoid.yml.example"
         ].each do |path|
           if File.readable?(path)
-            FileUtils.cp(path, "config/mongoid.yml")
+            fileutils.cp(path, "config/mongoid.yml")
             break
           end
         end
-        FileUtils.cp("config/project.yml.erb.example", "config/project.yml.erb")
+        fileutils.cp("config/project.yml.erb.example", "config/project.yml.erb")
       end
     end
 
     task :bundle_install do
-      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+      fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
       end
     end
@@ -66,14 +70,14 @@ namespace :vendor do
     ]
 
     task :fetch_and_checkout do
-      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+      fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git fetch origin")
         system!("git checkout origin/#{Fontana.branch}")
       end
     end
 
     task :db_drop do
-      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+      fileutils.chdir(FontanaClientSupport.vendor_fontana) do
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle exec rake db:drop")
       end
     end

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/fontana_client_support.rb

@@ -15,7 +15,7 @@ module FontanaClientSupport
 
     def current_branch_name
       unless @current_branch_name
-        work = `git log --decorate -1`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
+        work = `git log --decorate -1 --branches`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
           flatten.first.split(/,/).map(&:strip).reject{|s| s =~ /HEAD\Z/}
         r = work.select{|s| s =~ /origin\//}.first
         r ||= work.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: gem to support development and testing with GSS/fontana
@@ -74,12 +74,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []