fontana_client_support 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2MxNjA3NzI1OGZiODcyNDU5ZTZiNzZiOWFkYWZjZTYyNjViYzliOA==
+  data.tar.gz: !binary |-
+    ZjNmYTU0NDkwY2UwNWE1NzE3MjU1N2UwMDQ2OTNjZWE3NjkyMGMwMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTBjZGU4ZDgyNWJhMmJmMjBjMTUwNzliNGU0MWFkOTdiYjg1MWM5OGQwODQy
+    MjYwYTZmYjA3YWUyOTRlYzA3ODg0ZWNlN2NkNzE5MmEwOTdjNGZiYjhkNjdm
+    YzRlODEwMmJhMTc0OWMzNzNkMGUwZTk5MjEyZGE3NzgzMGM5Y2Y=
+  data.tar.gz: !binary |-
+    N2Q5MzI1ZTVkZjJjNGM1MzIwZmNlMTBjZjhlNzEyZDFkODY0ZmMyNDIzMGJi
+    OTUzODVjNjMwMDFkNDE1MWI3NTZjYmIzODNlNmI1ZGFhNDJjZTk2ZTY0ODE3
+    ODliMjE2N2UxNjY1MjgwMjdmZDRmZDg0OGZiZTc5NGNlYjdmNGE=

data/lib/fontana/command_utils.rb

@@ -1,3 +1,5 @@
+require 'fontana'
+
 module Fontana
   module CommandUtils
 

data/lib/fontana/rake_utils.rb

@@ -0,0 +1,30 @@
+require 'fontana'
+
+module Fontana
+  module RakeUtils
+
+    class << self
+      def enable_task_delegate
+        unless Rake::Task.ancestors.include?(Fontana::RakeUtils::Delegatable)
+          Rake::Task.send(:include, Fontana::RakeUtils::Delegatable)
+        end
+      end
+    end
+
+    module Delegatable
+      def delegate
+        self.prerequisite_tasks.each(&:delegate)
+        execute
+      end
+    end
+
+    def task_sequential(name, task_names)
+      Fontana::RakeUtils.enable_task_delegate
+      task(name) do
+        task_names.each do |name|
+          Rake::Task[name.to_s].delegate
+        end
+      end
+    end
+  end
+end

data/lib/fontana/server_rake.rb

@@ -1,3 +1,5 @@
+require 'fontana'
+
 module Fontana
   module ServerRake
 

data/lib/fontana.rb

@@ -3,6 +3,7 @@
 module Fontana
   autoload :CommandUtils, 'fontana/command_utils'
   autoload :ServerRake  , 'fontana/server_rake'
+  autoload :RakeUtils   , 'fontana/rake_utils'
 
   class << self
     # attr_accessor :home

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -1,14 +1,32 @@
+# -*- coding: utf-8 -*-
 require 'fontana_client_support'
 include Fontana::ServerRake
+include Fontana::RakeUtils
 
 namespace :vendor do
   namespace :fontana do
 
     task :clear do
-      FileUtils.rm_rf(FontanaClientSupport.vendor_fontana)
+      d = FontanaClientSupport.vendor_fontana
+      FileUtils.rm_rf(d) if Dir.exist?(d)
     end
 
-    task :clone => :"vendor:fontana:clear" do
+    # 動的に決まるタスクを静的に扱えるようにタスクを定義します
+    task :deploy_reset do
+      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:reset"].delegate
+    end
+    task :deploy_update do
+      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:update"].delegate
+    end
+
+    task_sequential :setup, [
+      :"vendor:fontana:clone",
+      :"vendor:fontana:configs",
+      :"vendor:fontana:bundle_install",
+      :"vendor:fontana:deploy_reset",
+    ]
+
+    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
@@ -16,33 +34,57 @@ namespace :vendor do
       end
       Dir.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git checkout #{Fontana.branch}")
-        FileUtils.cp(File.join(FontanaClientSupport.root_dir, "spec/server_config/mongoid.yml"), "config/mongoid.yml")
+      end
+    end
+
+    task :configs do
+      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+        [
+          File.join(FontanaClientSupport.root_dir, "config/fontana_mongoid.yml"),
+          "config/project.yml.erb.example"
+        ].each do |path|
+          if File.readable?(path)
+            FileUtils.cp(path, "config/mongoid.yml")
+            break
+          end
+        end
         FileUtils.cp("config/project.yml.erb.example", "config/project.yml.erb")
+      end
+    end
+
+    task :bundle_install do
+      Dir.chdir(FontanaClientSupport.vendor_fontana) do
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
       end
-      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:reset"].execute
     end
 
-    task :update do
+    task_sequential :update, [
+      :"vendor:fontana:fetch_and_checkout",
+      :"vendor:fontana:bundle_install",
+      :"vendor:fontana:db_drop",
+      :"vendor:fontana:deploy_update",
+    ]
+
+    task :fetch_and_checkout do
       Dir.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git fetch origin")
         system!("git checkout origin/#{Fontana.branch}")
-        system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
-        system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle exec rake db:drop")
       end
-      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:update"].execute
     end
 
-    task :prepare do
-      if Dir.exist?(FontanaClientSupport.vendor_fontana)
-        Rake::Task["vendor:fontana:update"].execute
-      else
-        Rake::Task["vendor:fontana:clone"].execute
+    task :db_drop do
+      Dir.chdir(FontanaClientSupport.vendor_fontana) do
+        system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle exec rake db:drop")
       end
     end
 
     desc "reset vendor/fontana"
-    task :reset => [:"vendor:fontana:clear", :"vendor:fontana:clone"]
+    task_sequential :reset, [:"vendor:fontana:clear", :"vendor:fontana:setup"]
+
+    task :prepare do
+      name = Dir.exist?(FontanaClientSupport.vendor_fontana) ? "update" : "reset"
+      Rake::Task["vendor:fontana:#{name}"].delegate
+    end
   end
 
 end

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,6 +53,7 @@ files:
 - fontana_client_support.gemspec
 - lib/fontana.rb
 - lib/fontana/command_utils.rb
+- lib/fontana/rake_utils.rb
 - lib/fontana/server_rake.rb
 - lib/fontana_client_support.rb
 - lib/fontana_client_support/tasks.rb
@@ -71,27 +67,26 @@ 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: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: gem to support development and testing with GSS/fontana
 test_files: []
 has_rdoc: