fontana_client_support 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9cec5bc5e9f37dacf46a8061e9dad4ebbe41dcb
-  data.tar.gz: 05effcbe5e02a50bb435b736d674c06447dc3fc8
+  metadata.gz: 32de00430365d7865f4ae1d9358c4465767bcd86
+  data.tar.gz: 5872211dd0a0ca9743e1478155053b28cf6fbe1c
 SHA512:
-  metadata.gz: 466b2ffe6398cb88ed07029d88dd8a01e8d3036d1401cfd45cdea746f4e1d6819043ff33e2d407bf044e9c037c47775c2652c541c8c7daff13a6794ae6e74d93
-  data.tar.gz: 88aac68f52270f3d4deaac0b0a25406563b56c0b29678977f2ea6c7f5ba2093c61771d87767f735d5c17588fbfe92b7b8f8080b9fcb0e98380129ea2eee8d3a2
+  metadata.gz: a6a0ecca172127313f4cf511ecdea9870e15d1720d20090a72ce555188e160176170637b8f9677a55ef9e4a7780c92e532f41976b28d9ae4a399aab1df7c30ef
+  data.tar.gz: 361fe52894855f7296d3e7c815505ccf081b9febf3a14e62a965c0cf5cb9ab4d9434d53e49c4f55f1aa318b27965bd9aad3e6a646bdc385620e1f9a8d2bcadfd

data/lib/fontana_client_support/tasks/init.rake

@@ -6,9 +6,11 @@ namespace :clear do
   task :all => [:"db:drop:all", :"vendor:fontana:clear"] do
     Dir.chdir(FontanaClientSupport.root_dir) do
       if `git diff`.strip.empty?
-        puts "\e[32mOK"
+        puts "\e[32mOK\e[0m"
       else
-        puts "\e[31mThere is/are different(s). Please, commit and/or revert your changes.\n" << `git status` << "\e[0m"
+        puts "\e[33mWARNING! There is/are different(s) from repository."  <<
+          "If you want to make the same environment as repository, commit and/or discard your changes.\e[0m\n" <<
+          `git status`
       end
     end
   end

data/lib/fontana_client_support/tasks/server.rake

@@ -155,4 +155,9 @@ namespace :servers do
 
   desc "restart development HTTP+HTTPS server daemons"
   task :restart => :"development:servers:restart"
+
+  namespace :stop do
+    desc "stop all HTTP+HTTPS server daemons"
+    task :all => [:"development:servers:stop", :"test:servers:stop"]
+  end
 end

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -25,11 +25,22 @@ namespace :vendor do
       end
     end
 
+    def vendor_fontana_branch
+      `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
+    end
+
+    def raise_if_fontana_branch_empty
+      if Fontana.branch.nil? || Fontana.branch.empty?
+        # FONTANA_BRANCHがnilならmasterが設定されているはずです
+        raise "\e[31mInvalid FONTANA_BRANCH: #{ENV['FONTANA_BRANCH'].inspect}. Please set valid value or unset FONTANA_BRANCH.\e[0m"
+      end
+    end
+
     task :version do
       puts vendor_fontana_version
     end
 
-    task :clear do
+    task :clear => :"servers:stop:all" do
       d = FontanaClientSupport.vendor_fontana
       fileutils.rm_rf(d) if Dir.exist?(d)
     end
@@ -51,16 +62,15 @@ namespace :vendor do
     ]
 
     task :clone do
+      raise_if_fontana_branch_empty
       raise "$FONTANA_REPO_URL is required" unless Fontana.repo_url
       fileutils.mkdir_p(FontanaClientSupport.vendor_dir)
       fileutils.chdir(FontanaClientSupport.root_dir) do
-        system!("git clone #{Fontana.repo_url} vendor/fontana")
+        system!("git clone #{Fontana.repo_url} vendor/fontana -b #{Fontana.branch}")
       end
       fileutils.chdir(FontanaClientSupport.vendor_fontana) do
-        if Fontana.version
+        unless Fontana.version.nil? || Fontana.version.empty?
           system!("git checkout master && git reset --hard #{Fontana.version}")
-        else
-          system!("git checkout #{Fontana.branch}")
         end
       end
     end
@@ -111,18 +121,47 @@ namespace :vendor do
     task_sequential :reset, [:"vendor:fontana:clear", :"vendor:fontana:setup"]
 
     task :prepare do
-      if vfv = vendor_fontana_version
-        if vfv == Fontana.version
-          puts "\e[32m#{Fontana.version} is already used.\e[0m"
-        else
-          puts "\e[33m#{vfv} is used but FONTANA_VERSION is #{Fontana.version}\e[0m"
-          # name = Dir.exist?(FontanaClientSupport.vendor_fontana) ? "update" : "reset"
-          # Rake::Task["vendor:fontana:#{name}"].delegate
-          Rake::Task["vendor:fontana:reset"].delegate
+      raise_if_fontana_branch_empty
+
+      vfb = vendor_fontana_branch
+      vfv = vendor_fontana_version
+
+      puts "vendor/fontana branch: #{vfb.inspect} version: #{vfv.inspect}"
+      puts "      required branch: #{Fontana.branch.inspect} version: #{Fontana.version.inspect}"
+
+      if !Dir.exist?(FontanaClientSupport.vendor_fontana)
+        # vendor/fontana が存在しない場合
+        puts "\e[34mvendor/fontana does not exist.\e[0m"
+        Rake::Task["vendor:fontana:reset"].delegate
+
+      elsif vfb != Fontana.branch
+        # vendor/fontanaのブランチが FONTANA_BRANCH と異なる場合
+        puts "\e[33m but FONTANA_BRANCH is #{Fontana.branch}\e[0m"
+        Rake::Task["vendor:fontana:reset"].delegate
+
+      elsif Fontana.version.nil? || Fontana.version.empty?
+        # FONTANA_BRANCHとvendor/fontanaのブランチが同じで、FONTANA_VERSIONが指定されていない場合
+        puts "\e[34mvendor/fontana's branch is #{vfb} as same as FONTANA_BRANCH. Now pulling origin #{vfb.inspect} \e[0m"
+        fileutils.chdir(FontanaClientSupport.vendor_fontana) do
+          system!("git pull origin #{Fontana.branch}; git status")
         end
-      else
+
+      elsif vfv.nil?
+        # FONTANA_BRANCHとvendor/fontanaのブランチが同じで、vendor/fontanaのバージョンが取得できない場合
         puts "\e[33mversion not found in vendor/fontana\e[0m"
         Rake::Task["vendor:fontana:reset"].delegate
+
+      elsif vfv == Fontana.version
+        # FONTANA_BRANCHとvendor/fontanaのブランチが同じで、FONTANA_VERSIONが指定されていて、vendor/fontanaのバージョンと同じものの場合
+        puts "\e[32m#{Fontana.version} is already used.\e[0m"
+
+      else
+        # FONTANA_BRANCHとvendor/fontanaのブランチが同じで、FONTANA_VERSIONが指定されていて、vendor/fontanaのバージョンと異なる場合
+        puts "\e[33m#{vfv} is used but FONTANA_VERSION is #{Fontana.version}\e[0m"
+        # name = Dir.exist?(FontanaClientSupport.vendor_fontana) ? "update" : "reset"
+        # Rake::Task["vendor:fontana:#{name}"].delegate
+        Rake::Task["vendor:fontana:reset"].delegate
+
       end
     end
 

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler