fontana_client_support 0.0.1 → 0.0.2

data/lib/fontana_client_support.rb

@@ -12,6 +12,16 @@ module FontanaClientSupport
     def vendor_fontana
       @vendor_fontana ||= File.join(vendor_dir, "fontana")
     end
+
+    def current_branch_name
+      @current_branch_name ||= `git log --decorate -1`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
+        flatten.first.split(/,/).map(&:strip).select{|s| s =~ /origin\//}.
+        reject{|s| s == "origin/HEAD"}.first.sub(/\Aorigin\//, '')
+    end
+
+    def repo_url
+      @repo_url ||= `git remote -v`.scan(/origin\s+(.+?)\s/).flatten.uniq.first
+    end
   end
 end
 

data/lib/fontana_client_support/tasks/deploy.rake

@@ -4,8 +4,8 @@ include Fontana::ServerRake
 namespace_with_fontana :deploy, :"app:deploy" do
 
   set_url_and_branch = ->{
-    ENV['URL'] ||= `git remote -v`.scan(/origin\s+(.+?)\s/).flatten.uniq.first
-    ENV['BRANCH'] ||= `git status`.scan(/^.+\sbranch\s(.+)\s*$/).flatten.first
+    ENV['URL'] ||= FontanaClientSupport.repo_url
+    ENV['BRANCH'] ||= FontanaClientSupport.current_branch_name
   }
 
   desc "deploy:setup deploy:update"
@@ -15,5 +15,5 @@ namespace_with_fontana :deploy, :"app:deploy" do
   fontana_task :setup, before: set_url_and_branch
 
   desc "fetch, checkout, build app_seed and migrate."
-  fontana_task :update
+  fontana_task :update, before: set_url_and_branch
 end

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -13,8 +13,8 @@ namespace :vendor do
     task :clone => :"vendor:fontana:clear" do
       raise "$FONTANA_REPO_URL is required" unless Fontana.repo_url
       FileUtils.mkdir_p(FontanaClientSupport.vendor_dir)
-      Dir.chdir(FontanaClientSupport.vendor_dir) do
-        system!("git clone #{Fontana.repo_url}")
+      Dir.chdir(FontanaClientSupport.root_dir) do
+        system!("git clone #{Fontana.repo_url} vendor/fontana")
       end
       Dir.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git checkout #{Fontana.branch}")

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - akima
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,26 +71,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: gem to support development and testing with GSS/fontana
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTAxZDE3MzhkM2VjMDQ2YWY1MzdjNzVlNzc5ZjYwNjZhMGUxOGQzNw==
-  data.tar.gz: !binary |-
-    MzczYTQ4MTlhOWQ1YjA0Mjg2NjlmOTE2MmZmMTdjOWFlMmQxYWRhZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWY2YzdlZWM0NjQzMTc3OTg0M2RjYjYxMWY1NTcwNjllNjg4YjFhZWJlMzg2
-    MzM5YTIwZTIyODYyNzRlNjQ0OTJiNDY1YjE4ODNjOTBjMjVjMDc0OWU4Yjkw
-    OTQzZGQyNmY1MDM5OTUwNWU5Zjc0ZGUxZDZiYTZkNTEwNmNkOTc=
-  data.tar.gz: !binary |-
-    MjlmMTcyNGQxZTVkOTM1NzZhZWM1NDU3MDIzMzdiNGI2Y2ZlNGI1Mjg4YzU4
-    NTJkMGQyOGI2NzdjZjc4MGUyM2JkY2JhNTMyNjNjNDVjOTQxY2U5MTdiYmQw
-    NDI1YzRjNTg4NmU0NTJiYjNkZmFjNmU0NTA1ZTdhY2NhNjU4NTQ=