fontana_client_support 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb4703a07cc90d6464574b2496b1d190d57ab2f
-  data.tar.gz: 81c6792dd383c7b0f4ab7b0676b435ae40a9909c
+  metadata.gz: dd1df0580d18385443b09b58a9e84e912c86ae3b
+  data.tar.gz: a16226f93506b90fa281cd84d9f0c631d5bcc2c4
 SHA512:
-  metadata.gz: 640166a805a597dc89d3a10d06a41e13ddc526fde925dd778e9959ccb28f7107623f0c52007e7e12edcef9d2e8c577aab30313c593741e831f4a5ff2e299213a
-  data.tar.gz: 0ce01a1e42df1ea0a74e0cb2f9f7a47b20404ba0cae8c969e4316c3d00b03a0c5a7cd4221c82121747ca24604cd24f4af192859c734bcd1c7bc4bd00f077632d
+  metadata.gz: 6c20ca74ea7432989b4483dd21e568c512c3ba7a9d7c12c52d93e856da3969c38cdd2854fe732d543e44e055c19c2feabdecddfd26d036998b88bc266ec7c737
+  data.tar.gz: 5ed88c5ee9328d00aaa374a80b2567b4ae75cf97e3a8b53af5d9ef59747c228da94f515d2de1a8a2f34e80c6a7749dcadad30e46bb9b732758fcfcd3075dfe48

data/lib/fontana_client_support/tasks/deploy/scm.rake

@@ -8,12 +8,13 @@ namespace :deploy do
   namespace_with_fontana :scm, :"app:scm" do
 
     set_url_and_branch = ->{
-      ENV['URL'] ||= FontanaClientSupport.repo_url
-      ENV['BRANCH'] ||= FontanaClientSupport.current_branch_name
     }
 
     desc "deploy:scm:setup + clone (+ checkout branch) + deploy:scm:update."
-    fontana_task :reset, before: set_url_and_branch
+    fontana_task :reset, env: {
+      'URL' => FontanaClientSupport.repo_url,
+      'BRANCH' => FontanaClientSupport.current_branch_name
+    }
 
     desc "drop DB, initialize, clear runtime workspace."
     fontana_task :setup

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -22,8 +22,10 @@ namespace :vendor do
     end
 
     def vendor_fontana_branch
-      # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
-      `git symbolic-ref --short HEAD`.strip
+      return nil unless Dir.exist?(FontanaClientSupport.vendor_fontana)
+      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+        return FontanaClientSupport.git_current_branch_name
+      end
     end
 
     def raise_if_fontana_branch_empty
@@ -133,7 +135,7 @@ namespace :vendor do
 
       elsif vfb != Fontana.branch
         # vendor/fontanaのブランチが FONTANA_BRANCH と異なる場合
-        puts "\e[33m but FONTANA_BRANCH is #{Fontana.branch}\e[0m"
+        # puts "\e[33m but FONTANA_BRANCH is #{Fontana.branch}\e[0m"
         Rake::Task["vendor:fontana:reset"].delegate
 
       elsif Fontana.version.nil? || Fontana.version.empty?

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/fontana_client_support.rb

@@ -15,8 +15,17 @@ module FontanaClientSupport
       @vendor_fontana ||= File.join(vendor_dir, "fontana")
     end
 
-    def current_branch_name
-      @current_branch_name ||= `git symbolic-ref --short HEAD`.strip
+    def git_current_branch_name
+      # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
+      result = `git symbolic-ref --short HEAD`.strip
+      return result unless result.nil? || result.empty?
+      result = `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
+      return result unless result.nil? || result.empty?
+      work = `git log --decorate -1`.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
+      result = r.sub(/\Aorigin\//, '')
     rescue => e
       puts "[#{e.class}] #{e.message}"
       puts "Dir.pwd: #{Dir.pwd}"
@@ -24,6 +33,18 @@ module FontanaClientSupport
       raise e
     end
 
+    def current_branch_name
+      raise "missing root_dir" if root_dir.nil?
+      raise "root_dir does not exist: #{root_dir.inspect}" unless Dir.exist?(root_dir)
+      unless @current_branch_name
+        Dir.chdir(root_dir) do
+          @current_branch_name = git_current_branch_name
+        end
+      end
+      puts "@current_branch_name: #{@current_branch_name.inspect}"
+      return @current_branch_name
+    end
+
     def repo_url
       @repo_url ||= `git remote -v`.scan(/origin\s+(.+?)\s/).flatten.uniq.first
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - akima