fontana_client_support 0.0.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWRmZjcxNmE3MjFmNWNmYzdiNzMzNDdlYmJmNzk3MWU1OGJmNTU1YQ==
+  data.tar.gz: !binary |-
+    MDQzMDc2ZjE3N2ZiN2QwYTFiNTIxZTA1ODZjOTEyYjkxMGFkMGFmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGZlMGY1Y2RjYWVhN2QxOWZiYTAwNGUzMDAwMWRlMzFjNjgwZTM0Mjg1NTMz
+    OTVlMDRjYmI1YTEzNThiYjY1NDk5M2UzYmNkNzkwMDkyODBjODljMjkyYTQx
+    NjdjOGMyMjIzMWY0OTQ0NTZlZTdkMWIyZjAwNTY2M2UwYTkyNTE=
+  data.tar.gz: !binary |-
+    MGI3OTUwZTM1ZDdjZmY1MTQ0ZGI1MDc3ODRmMTQ3ZWMwMjAzNWQ5ZmM3YzM5
+    OGFhYTZhODJlNjVkZTEzNDI4OTk3OTMyNGFiYWQwMmQ1NzA5OTMwMzNlNTRj
+    MWI2MGMzNjk5N2FlMGFjMzY1NWU4NGM4MDNmNzJlZDMzN2EwZDE=

data/README.md

@@ -1,6 +1,11 @@
 # FontanaClientSupport
 
-TODO: Write a gem description
+FontanaのAppSeedファイルやストアドスクリプトを開発するためのgemです。
+サーバの起動、テストの実行をサポートする機能を提供します。
+
+具体的な使い方は
+https://github.com/groovenauts/fontana_sample/tree/develop
+を参照してください
 
 ## Installation
 

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

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'fontana_client_support'
+include Fontana::ServerRake
+
+namespace :deploy do
+
+  # このタスク群は sync:* と対になっています。
+  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
+
+    desc "drop DB, initialize, clear runtime workspace."
+    fontana_task :setup
+
+    desc "fetch, checkout, build app_seed and migrate."
+    fontana_task :update
+  end
+
+end

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

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'fontana_client_support'
+include Fontana::ServerRake
+
+namespace :deploy do
+
+  # このタスク群は scm:* と対になっています。
+  namespace_with_fontana :sync, :"app:sync" do
+
+    runtime_source = ->{
+      ENV["RUNTIME_SOURCE"] = File.expand_path(".", FontanaClientSupport.root_dir)
+    }
+
+
+    desc "deploy:sync:setup + deploy:sync:update"
+    fontana_task :reset, before: runtime_source
+
+    desc "drop DB + initialize DB + clear runtime workspace. same as app:sync:setup"
+    fontana_task :setup
+
+    desc "update runtime + app_seed:build_from_runtime + migrate."
+    fontana_task :update, before: runtime_source
+  end
+
+end

data/lib/fontana_client_support/tasks/server.rake

@@ -2,27 +2,24 @@ require 'fontana_client_support'
 include Fontana::ServerRake
 
 namespace_with_fontana :server, :libgss_test do
-  desc "luanch HTTP server"
-  fontana_task :launch_http_server
 
-  desc "luanch HTTP server daemon"
+  fontana_task :launch_http_server
   fontana_task :launch_http_server_daemon
-
-  desc "luanch HTTPS server"
   fontana_task :launch_https_server
-
-  desc "luanch HTTPS server daemon"
   fontana_task :launch_https_server_daemon
+  fontana_task :launch_server_daemons
+  fontana_task :shutdown_server_daemons
+  fontana_task :check_daemon_alive
+end
 
-  desc "luanch server"
-  fontana_task :launch_server
 
-  desc "luanch server daemons"
-  fontana_task :launch_server_daemons
+namespace :servers do
+  desc "start HTTP+HTTPS server daemons"
+  task :start => :"server:launch_server_daemons"
 
-  desc "shutdown server daemons"
-  fontana_task :shutdown_server_daemons
+  desc "stop HTTP+HTTPS server daemons"
+  task :stop => :"server:shutdown_server_daemons"
 
-  desc "check daemon alive"
-  fontana_task :check_daemon_alive
+  desc "restart HTTP+HTTPS server daemons"
+  task :restart => [:"servers:stop", :"servers:start"]
 end

data/lib/fontana_client_support/tasks/spec.rake

@@ -2,7 +2,7 @@
 require 'fontana_client_support'
 include Fontana::ServerRake
 
-desc "run spec with server_daemons"
+desc "Run RSpec with server_daemons"
 task :spec_with_server_daemons => [:"vendor:fontana:prepare"] do
   Rake::Task["server:launch_server_daemons"].execute
   begin

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -4,12 +4,10 @@ include Fontana::ServerRake
 namespace :vendor do
   namespace :fontana do
 
-    desc "clear"
     task :clear do
       FileUtils.rm_rf(FontanaClientSupport.vendor_fontana)
     end
 
-    desc "clone"
     task :clone => :"vendor:fontana:clear" do
       raise "$FONTANA_REPO_URL is required" unless Fontana.repo_url
       FileUtils.mkdir_p(FontanaClientSupport.vendor_dir)
@@ -22,10 +20,9 @@ namespace :vendor do
         FileUtils.cp("config/project.yml.erb.example", "config/project.yml.erb")
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
       end
-      Rake::Task["deploy:reset"].execute
+      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:reset"].execute
     end
 
-    desc "update"
     task :update do
       Dir.chdir(FontanaClientSupport.vendor_fontana) do
         system!("git fetch origin")
@@ -33,10 +30,9 @@ namespace :vendor do
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle install")
         system!("BUNDLE_GEMFILE=#{Fontana.gemfile} bundle exec rake db:drop")
       end
-      Rake::Task["deploy:update"].execute
+      Rake::Task["deploy:#{FontanaClientSupport.deploy_strategy}:update"].execute
     end
 
-    desc "prepare"
     task :prepare do
       if Dir.exist?(FontanaClientSupport.vendor_fontana)
         Rake::Task["vendor:fontana:update"].execute
@@ -44,8 +40,9 @@ namespace :vendor do
         Rake::Task["vendor:fontana:clone"].execute
       end
     end
+
+    desc "reset vendor/fontana"
+    task :reset => [:"vendor:fontana:clear", :"vendor:fontana:clone"]
   end
 
-  desc "prepare vendor/fontana "
-  task :fontana => :"vendor:fontana:prepare"
 end

data/lib/fontana_client_support/tasks.rb

@@ -1,3 +1,5 @@
 require 'fontana_client_support'
 
+require "rspec/core/rake_task"
+
 Dir[File.expand_path("../tasks/**/*.rake", __FILE__)].each{|f| load(f)}

data/lib/fontana_client_support/version.rb

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

data/lib/fontana_client_support.rb

@@ -14,14 +14,42 @@ module FontanaClientSupport
     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\//, '')
+      unless @current_branch_name
+        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
+        @current_branch_name = r.sub(/\Aorigin\//, '')
+      end
+      @current_branch_name
+    rescue => e
+      puts "[#{e.class}] #{e.message}"
+      puts "Dir.pwd: #{Dir.pwd}"
+      puts "git log --decorate -1\n" << `git log --decorate -1`
+      raise e
     end
 
     def repo_url
       @repo_url ||= `git remote -v`.scan(/origin\s+(.+?)\s/).flatten.uniq.first
     end
+
+    def deploy_strategy
+      @deploy_strategy ||= :deploy
+    end
+
+    DEPLOY_STRATEGY_NAMES = [:scm, :sync].freeze
+
+    def deploy_strategy=(v)
+      unless DEPLOY_STRATEGY_NAMES.include?(v)
+        raise ArgumentError, "invalid deploy_strategy: #{v.inspect} must be one of #{DEPLOY_STRATEGY_NAMES.inspect}"
+      end
+      @deploy_strategy = v
+    end
+
+    def configure
+      yield(self) if block_given?
+      self
+    end
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 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
@@ -61,37 +56,36 @@ files:
 - lib/fontana/server_rake.rb
 - lib/fontana_client_support.rb
 - lib/fontana_client_support/tasks.rb
-- lib/fontana_client_support/tasks/deploy.rake
+- lib/fontana_client_support/tasks/deploy/scm.rake
+- lib/fontana_client_support/tasks/deploy/sync.rake
 - lib/fontana_client_support/tasks/fixtures.rake
 - lib/fontana_client_support/tasks/server.rake
 - lib/fontana_client_support/tasks/spec.rake
-- lib/fontana_client_support/tasks/sync.rake
 - lib/fontana_client_support/tasks/vendor_fontana.rake
 - lib/fontana_client_support/version.rb
 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: 

data/lib/fontana_client_support/tasks/deploy.rake

@@ -1,19 +0,0 @@
-require 'fontana_client_support'
-include Fontana::ServerRake
-
-namespace_with_fontana :deploy, :"app:deploy" do
-
-  set_url_and_branch = ->{
-    ENV['URL'] ||= FontanaClientSupport.repo_url
-    ENV['BRANCH'] ||= FontanaClientSupport.current_branch_name
-  }
-
-  desc "deploy:setup deploy:update"
-  fontana_task :reset, before: set_url_and_branch
-
-  desc "drop DB, initialize, clear workspaces, clone, checkout branch. $URL required."
-  fontana_task :setup, before: set_url_and_branch
-
-  desc "fetch, checkout, build app_seed and migrate."
-  fontana_task :update, before: set_url_and_branch
-end

data/lib/fontana_client_support/tasks/sync.rake

@@ -1,16 +0,0 @@
-require 'fontana_client_support'
-include Fontana::ServerRake
-
-namespace_with_fontana :sync, :"runtime:update" do
-  desc "sync app/scripts directly"
-  fontana_task :app_scripts, before: ->{ ENV["APP_SCRIPTS_PATH"] = File.expand_path("../app/scripts", __FILE__) }
-
-  desc "sync spec/fixtures directly"
-  fontana_task :spec_fixtures, before: ->{ ENV["SPEC_FIXTURES_PATH"] = File.expand_path("../spec/fixtures", __FILE__) }
-
-  desc "sync app/scripts and spec/fixtures directly"
-  fontana_task :client, before: ->{
-    ENV["APP_SCRIPTS_PATH"] = File.expand_path("../app/scripts", __FILE__)
-    ENV["SPEC_FIXTURES_PATH"] = File.expand_path("../spec/fixtures", __FILE__)
-  }
-end