fontana_client_support 0.5.7 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2E5MGJjNmMwN2EzNmRiNjExZWIzNzUzNTBjYjdlYTQyYmUxZjdhNw==
+    ZDBlMGI3YjhjYjljODhjN2IzNTUxZDkxMDA2M2QwOGYwOTlmNzBhZA==
   data.tar.gz: !binary |-
-    ZmFkNzgzOGQ0ZWVjNjkyMDYzYzZkYTFhNjdkNDVhYzRlNGRjMzdjMQ==
+    OGZlMDU4YTQzZDFmZTc1ZWQyMTA5YzdlZWQxODMxZTUxOTViZTQ1MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjUzY2FiODUzYzQ0Y2IzNTcyYWNkZjhmMjMyNjYyNTE5Y2Y2ODJmOGE4YjYz
-    NDRhNzljN2U2Y2RlY2E5ZDBhYWQ4NDBjNjMyMDZiYjk0YTAxOTA2Nzk3MGI2
-    YzM5ZTJmMTFiMjFkODQ3Yzc4ZWU3Mzc3NTAyNmVjYTgyNzVhYzY=
+    ODVkYWNlMzMxOGZkYzAzZTRhMjA5MjQ3MzM4MTI2MzI4MWUwMDhlYjkyNDRm
+    YTRlZDNmOGU4MjYxMjE2YTIxYzAxNmJiZWUwZWZjOTVjYmNkZTQ5MmQyN2Y2
+    NzcyZmU3ZTU3OTJkODgxZDRkNTgyNmQzYzFkYWQ3MTRjOGNhODM=
   data.tar.gz: !binary |-
-    YTlkZmUwM2MyNTI1YWM0YWRkOTVmMWVjNTZmNjk5NjIxZDU1NWIyYWFlZWNh
-    YWVjMDU5NzgyODViYzE5OThkNjBhOWIyNzI2MjExYzM4NDkyMzQyMzc2YTZh
-    ODg3ZGZkMjVlNTQ2N2JlMzE0NDNmOWE1ODBjMWU1NWMzYmIzNjM=
+    MzQzZWMyZjhiMDc1ODc5ODU2N2I4NzM2NTE0MzRlYTIzMWE4YjdkM2M1ZWEz
+    YmVjOTZlM2VkNDJjNzc3ODIwZjRjOGFjODliZWZiMjUyOTI5NTcyMDllZjc1
+    ZmY1OTc1Mjc0NzI3NWQ0MWY3MzA0ZTgxNTIwN2RiZjI2NmJlMjI=

data/lib/fontana.rb

@@ -29,15 +29,14 @@ module Fontana
       @env ||= (ENV["FONTANA_ENV"] || "DEVELOPMENT").to_sym
     end
 
-    def version
-      unless @version
-        @version = ENV['FONTANA_VERSION' ]
-        unless @version
-          path = File.expand_path("FONTANA_VERSION", FontanaClientSupport.root_dir)
-          @version = File.read(path).strip if File.readable?(path)
-        end
-      end
-      @version
+    # これは fontanaの Fontana.app_mode と同じ動きをすることが期待されています。
+    # https://github.com/tengine/fontana/blob/master/config/application.rb#L47
+    def app_mode
+      (ENV["FONTANA_APP_MODE"] || "development").to_sym # production development test
+    end
+
+    def app_mode=(value)
+      ENV["FONTANA_APP_MODE"] = value
     end
 
   end

data/lib/fontana/command_utils.rb

@@ -1,10 +1,37 @@
 require 'fontana'
+require 'fileutils'
+require "shellwords"
 
 module Fontana
   module CommandUtils
 
     module_function
 
+    def system_at_vendor_fontana!(cmd, &block)
+      FileUtils::Verbose.chdir(FontanaClientSupport.vendor_fontana) do
+        return system!(cmd, &block)
+      end
+    end
+
+    def spawn_at_vendor_fontana(env, cmd, options = {})
+      options = { chdir: FontanaClientSupport.vendor_fontana }.update(options)
+      env = env.each_with_object({}){|(k,v), d| d[k.to_s] = v.to_s }
+      puts "now spawning:\n  env: #{env.inspect}\n  cmd: #{cmd.inspect}\n  options: #{options.inspect}"
+      pid = spawn(env, cmd, options)
+      puts "spawning suceeded pid: #{pid.inspect}"
+      Process.detach(pid)
+      return pid
+    end
+
+    def spawn_at_vendor_fontana_with_sweeper(*args)
+      pid = spawn_at_vendor_fontana(*args)
+      at_exit{
+        puts "Now killing #{pid}"
+        Process.kill("INT", pid)
+      }
+      pid
+    end
+
     def system!(cmd)
       puts "now executing: #{cmd}"
 

data/lib/fontana_client_support/tasks/app_mode.rake

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'fontana_client_support'
+
+namespace :app_mode do
+
+  desc "show app_mode"
+  task :show do
+    puts Fontana.app_mode.inspect
+  end
+
+  # 以下に:productionがありませんが、rakeタスクでproductionに設定することは想定できないので、敢えて作っていません。
+
+  desc "set app_mode test"
+  task :test do
+    Fontana.app_mode = "test"
+  end
+
+  desc "set app_mode development"
+  task :development do
+    Fontana.app_mode = "development"
+  end
+
+end
+
+task :app_model => :"app_mode:show"

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

@@ -20,6 +20,9 @@ namespace :deploy do
 
     desc "fetch, checkout, build app_seed and migrate."
     fontana_task :update
+
+    desc "db:drop, db:seed, build app_seed and migrate."
+    fontana_task :reset_db
   end
 
 end

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

@@ -20,6 +20,9 @@ namespace :deploy do
 
     desc "update runtime + app_seed:build_from_runtime + migrate."
     fontana_task :update, before: runtime_source
+
+    desc "db:drop, db:seed, app_seed:build_from_runtime + migrate."
+    fontana_task :reset_db
   end
 
 end

data/lib/fontana_client_support/tasks/server.rake

@@ -1,27 +1,157 @@
+# -*- coding: utf-8 -*-
 require 'fontana_client_support'
-include Fontana::ServerRake
 
+require 'timeout'
+
+include Fontana::CommandUtils
 extend Fontana::RakeUtils
 
-namespace_with_fontana :server, :libgss_test do
+def build_env_str(env)
+  env.each_with_object([]){|(k,v), d|
+    d << "#{k.to_s}=#{v.to_s}"
+  }.join(" ")
+end
+
+{
+  development: {http_port: 3000, https_port: 3001 },
+  test:        {http_port: 4000, https_port: 4001 },
+}.each do |app_mode, config|
+  namespace app_mode.to_sym do
+
+    pid_dir = File.join(FontanaClientSupport.vendor_fontana, "tmp/pids")
+
+    namespace :server do
+      http_env = {FONTANA_APP_MODE: app_mode, BUNDLE_GEMFILE: "Gemfile-LibgssTest" }
+      https_env = http_env.merge(HTTPS_PORT: config[:https_port])
+
+      http_env_str = build_env_str(http_env)
+      https_env_str = build_env_str(https_env)
+
+      desc "update VersionSet entries' versions and copy collections"
+      task(:update_version_set_entries) do
+        if ENV["GSS_VERSION_SET_FIXTURE_FILEPATH"]
+          system_at_vendor_fontana!(http_env_str + " rake version_set:update_entry_versions")
+        end
+      end
+
+      http_base_cmd = "bundle exec rails server -p #{config[:http_port]}"
+      http_fg_cmd = "#{http_env_str} #{http_base_cmd}"
+      http_bg_cmd = "#{http_env_str} #{http_base_cmd} -d -P #{pid_dir}/#{app_mode}_http_server.pid"
+
+      # HTTPSのポートは script/secure_rails の内部で ENV['HTTPS_PORT'] を参照しています
+      https_base_cmd = "bundle exec script/secure_rails server webrick"
+      https_fg_cmd = "#{https_env_str} #{https_base_cmd}"
+      https_bg_cmd = "#{https_env_str} #{https_base_cmd} -d -P #{pid_dir}/#{app_mode}_https_server.pid"
+
+      {
+        launch_http_server:         http_fg_cmd,
+        launch_http_server_daemon:  http_bg_cmd,
+        launch_https_server:        https_fg_cmd,
+        launch_https_server_daemon: https_bg_cmd,
+      }.each do |name, cmd|
+        task(name){ system_at_vendor_fontana!(cmd) }
+      end
+
+      task_sequential :launch_server_daemons, [
+        :"#{app_mode}:server:update_version_set_entries",
+        :"#{app_mode}:server:launch_http_server_daemon",
+        :"#{app_mode}:server:launch_https_server_daemon"
+      ]
+
+      spawn_env = {FONTANA_APP_MODE: app_mode, BUNDLE_GEMFILE: "Gemfile-LibgssTest" }
+      task(:spawn_http_server){ spawn_at_vendor_fontana_with_sweeper(http_env, http_base_cmd, out: "/dev/null") }
+      task(:spawn_https_server){ spawn_at_vendor_fontana_with_sweeper(https_env, https_base_cmd, out: "/dev/null") }
+
+      task_sequential :spawn_servers, [
+        :"#{app_mode}:server:update_version_set_entries",
+        :"#{app_mode}:server:spawn_http_server",
+        :"#{app_mode}:server:spawn_https_server"
+      ]
+
+      {
+        http: config[:http_port],
+        https: config[:https_port],
+      }.each do |name, port|
+
+        task(:"error_on_#{name}_listened") do
+          lsof = `lsof -i:#{port}`
+          if lsof =~ /LISTEN/
+            raise "\e[31mAnother server is already running on #{port}. Stop it in order to run new server.\n#{lsof}\e[0m"
+          end
+        end
+
+        task(:"wait_to_listen_#{name}") do
+          timeout((ENV["WAIT_TO_LISTEN"] || 120).to_i) do
+            while true
+              break if `lsof -i:#{port}` =~ /LISTEN/
+              sleep(0.2)
+            end
+          end
+        end
+      end
+
+      desc "error on ports listened by some server"
+      task :error_on_ports_listened => [
+        :error_on_http_listened,
+        :error_on_https_listened,
+      ]
+
+      desc "wait to listen ports"
+      task :wait_to_listen_ports => [
+        :wait_to_listen_http,
+        :wait_to_listen_https,
+      ]
+
+    end
+
+    namespace :servers do
+      desc "start #{app_mode} HTTP+HTTPS server daemons" if app_mode == :test
+      task :start => :"#{app_mode}:server:launch_server_daemons"
+
+      desc "stop #{app_mode} HTTP+HTTPS server daemons"  if app_mode == :test
+      task :stop => :"#{app_mode}:servers:shutdown_server_daemons"
+
+      desc "stop #{app_mode} HTTP+HTTPS server daemons when process exit" if app_mode == :test
+      task :stop_on_exit do
+        at_exit{ Rake::Task["test:servers:stop"].execute }
+      end
+
+      desc "restart #{app_mode} HTTP+HTTPS server daemons"  if app_mode == :test
+      task_sequential(:restart, [:"#{app_mode}:servers:stop", :"#{app_mode}:servers:start"])
+
+      # desc "shutdown server daemons"
+      task :shutdown_server_daemons do
+        Dir.glob(File.join(pid_dir, "#{app_mode}_*.pid")) do |pid_path|
+          pid = `cat #{pid_path}`.strip
+          system!("kill -INT #{pid}")
+        end
+      end
+
+      desc "check #{app_mode} daemon alive"
+      task :check_daemon_alive do
+        pids = Dir.glob(File.join(pid_dir, "#{app_mode}_*.pid")).to_a
+        unless pids.empty?
+          msg = "\e[31mdaemons seems to be still alive! #{pids.inspect}\n"
+          cmd = "ps " + pids.map{|pid| "-p `cat #{pid}`" }.join(" ")
+          msg << `#{cmd}`
+          msg << "\n You can stop these daemons by using `rake test:servers:stop`"
+          msg << "\e[0m"
+          raise msg
+        end
+      end
+    end
 
-  fontana_task :launch_http_server
-  fontana_task :launch_http_server_daemon
-  fontana_task :launch_https_server
-  fontana_task :launch_https_server_daemon
-  fontana_task :launch_server_daemons
-  fontana_task :shutdown_server_daemons
-  fontana_task :check_daemon_alive
+  end
 end
 
 
 namespace :servers do
-  desc "start HTTP+HTTPS server daemons"
-  task :start => :"server:launch_server_daemons"
+  desc "start development HTTP+HTTPS server daemons"
+  task :start => :"development:servers:start"
 
-  desc "stop HTTP+HTTPS server daemons"
-  task :stop => :"server:shutdown_server_daemons"
+  desc "stop development HTTP+HTTPS server daemons"
+  task :stop => :"development:servers:stop"
 
-  desc "restart HTTP+HTTPS server daemons"
-  task_sequential(:restart, [:"servers:stop", :"servers:start"])
+  desc "restart development HTTP+HTTPS server daemons"
+  task :restart => :"development:servers:restart"
 end

data/lib/fontana_client_support/tasks/spec.rake

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 require 'fontana_client_support'
-include Fontana::ServerRake
+
+extend Fontana::RakeUtils
 
 desc "Run RSpec with server_daemons"
-task :spec_with_server_daemons => [:"vendor:fontana:prepare"] do
-  Rake::Task["server:launch_server_daemons"].execute
-  begin
-    sleep( (ENV["FONTANA_LAUNCH_SLEEP"] || 5).to_i ) # 実際にポートをLINSTENするまで待つ
-    Rake::Task["spec"].execute
-  ensure
-    Rake::Task["server:shutdown_server_daemons"].execute
-  end
-end
+task_sequential :spec_with_server_daemons, [
+  :"app_mode:test",
+  :"test:server:error_on_ports_listened",
+  :"vendor:fontana:prepare",
+  :"test:server:spawn_servers",
+  :"test:server:wait_to_listen_ports",
+  :spec
+]

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -15,12 +15,13 @@ namespace :vendor do
       fileutils.rm_rf(d) if Dir.exist?(d)
     end
 
-    # 動的に決まるタスクを静的に扱えるようにタスクを定義します
-    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
+    case FontanaClientSupport.deploy_strategy
+    when :scm then
+      task :deploy_reset  => :"deploy:scm:reset"
+      task :deploy_update => :"deploy:scm:update"
+    when :sync then
+      task :deploy_reset  => :"deploy:sync:reset"
+      task :deploy_update => :"deploy:sync:update"
     end
 
     task_sequential :setup, [
@@ -37,11 +38,7 @@ namespace :vendor do
         system!("git clone #{Fontana.repo_url} vendor/fontana")
       end
       fileutils.chdir(FontanaClientSupport.vendor_fontana) do
-        if Fontana.version
-          system!("git checkout master && git reset --hard #{Fontana.version}")
-        else
-          system!("git checkout #{Fontana.branch}")
-        end
+        system!("git checkout #{Fontana.branch}")
       end
     end
 
@@ -68,6 +65,7 @@ namespace :vendor do
 
     task_sequential :update, [
       :"vendor:fontana:fetch_and_checkout",
+      :"vendor:fontana:configs",
       :"vendor:fontana:bundle_install",
       :"vendor:fontana:db_drop",
       :"vendor:fontana:deploy_update",
@@ -93,6 +91,8 @@ namespace :vendor 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.5.7"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/fontana_client_support.rb
 - lib/fontana_client_support/config_server.rb
 - lib/fontana_client_support/tasks.rb
+- lib/fontana_client_support/tasks/app_mode.rake
 - lib/fontana_client_support/tasks/config_server.rake
 - lib/fontana_client_support/tasks/deploy/scm.rake
 - lib/fontana_client_support/tasks/deploy/sync.rake