fontana_client_support 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e1aa491f241c88c91e639d7949ca10fb0f28a6
-  data.tar.gz: 2dfd77efd5874b539404c6c26e22d794bd22e4fe
+  metadata.gz: fbb4703a07cc90d6464574b2496b1d190d57ab2f
+  data.tar.gz: 81c6792dd383c7b0f4ab7b0676b435ae40a9909c
 SHA512:
-  metadata.gz: 50a8a27c2731eee668faad8b87d9347a9ab922190c58441f008c37ec1ff9d92a6714de480d267746cab64db30c88b60bcc6243fa057924d6cc28f9b22b0c91ae
-  data.tar.gz: 987660b4ac6d7c63d8309b7f0c349fda9f1a8af0bad977134f26c26f84ba6d33da53c1830f88dbbd864905c2d7337bb2da4c934158623831c45ce1b7e03c4d10
+  metadata.gz: 640166a805a597dc89d3a10d06a41e13ddc526fde925dd778e9959ccb28f7107623f0c52007e7e12edcef9d2e8c577aab30313c593741e831f4a5ff2e299213a
+  data.tar.gz: 0ce01a1e42df1ea0a74e0cb2f9f7a47b20404ba0cae8c969e4316c3d00b03a0c5a7cd4221c82121747ca24604cd24f4af192859c734bcd1c7bc4bd00f077632d

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+*.log
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/fontana.rb

@@ -13,7 +13,6 @@ module Fontana
     attr_accessor :gemfile
 
     attr_accessor :repo_url
-    attr_accessor :branch
 
     def home
       @home ||= ENV['FONTANA_HOME'] || (Dir.exist?(FontanaClientSupport.vendor_fontana) or Fontana.repo_url) ? FontanaClientSupport.vendor_fontana : nil
@@ -32,23 +31,36 @@ module Fontana
     # これは 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
+      (ENV["FONTANA_APP_MODE"] || "test").to_sym # production development test
     end
 
     def app_mode=(value)
       ENV["FONTANA_APP_MODE"] = value
     end
 
+    def branch
+      unless @branch
+        @branch = ENV['FONTANA_BRANCH' ]
+        load_fontana_version_file unless @branch
+      end
+      @branch
+    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
+        load_fontana_version_file unless @version
       end
       @version
     end
 
+    def load_fontana_version_file
+      path = File.expand_path("FONTANA_VERSION", FontanaClientSupport.root_dir)
+      line = File.read(path).strip
+      @version, @branch = line.split(/\@/, 2).map{|s| s.empty? ? nil : s }
+      @branch ||= "master"
+    end
+    private :load_fontana_version_file
+
   end
 end

data/lib/fontana_client_support.rb

@@ -16,17 +16,7 @@ module FontanaClientSupport
     end
 
     def current_branch_name
-      unless @current_branch_name
-        @current_branch_name = `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
-        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
-      end
-      @current_branch_name
+      @current_branch_name ||= `git symbolic-ref --short HEAD`.strip
     rescue => e
       puts "[#{e.class}] #{e.message}"
       puts "Dir.pwd: #{Dir.pwd}"
@@ -62,5 +52,4 @@ end
 require 'fontana'
 
 Fontana.repo_url = ENV['FONTANA_REPO_URL']
-Fontana.branch   = ENV['FONTANA_BRANCH'  ] || 'master'
 Fontana.gemfile  = ENV['FONTANA_GEMFILE' ] || "Gemfile-LibgssTest"

data/lib/fontana_client_support/config_server.rb

@@ -11,9 +11,10 @@ module FontanaClientSupport
     end
 
     def launch
+      $stdout.puts "pwd                  : #{Dir.pwd.inspect}"
       require 'webrick'
       root_dir = FontanaClientSupport.root_dir
-      document_root_source = @config[:document_root] || root_dir ? File.join(root_dir, "config_server") : "."
+      document_root_source = @config[:document_root] || (root_dir ? File.join(root_dir, "config_server") : ".")
       $stdout.puts "config_server options: #{@config.inspect}"
       $stdout.puts("root_dir             : #{root_dir.inspect}")
       $stdout.puts("document_root_source : #{document_root_source.inspect}")
@@ -91,6 +92,8 @@ module FontanaClientSupport
           end
           $stdout.reopen("/dev/null")
           $stderr.reopen("/dev/null")
+          # $stdout.reopen("stdout.log")
+          # $stderr.reopen("stderr.log")
           begin
             self.new(options).launch
           ensure

data/lib/fontana_client_support/tasks/delayed_job.rake

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'fontana_client_support'
+
+include Fontana::CommandUtils
+extend Fontana::RakeUtils
+
+def build_env_str(env)
+  env.each_with_object([]){|(k,v), d|
+    d << "#{k.to_s}=#{v.to_s}"
+  }.join(" ")
+end
+
+[:development, :test].each do |app_mode|
+  namespace app_mode do
+    namespace :delayed_job do
+
+      cmd_env = {FONTANA_APP_MODE: app_mode, BUNDLE_GEMFILE: "Gemfile-LibgssTest" }
+      cmd_env_str = build_env_str(cmd_env)
+
+      commands = {
+        start:   "start an instance of the application",
+        stop:    "stop all instances of the application",
+        restart: "stop all instances and restart them afterwards",
+        reload:  "send a SIGHUP to all instances of the application",
+        run:     "start the application and stay on top",
+        zap:     "set the application to a stopped state",
+        status:  "show status (PID) of application instances",
+      }
+
+      cmd_base = cmd_env_str + " bundle exec script/delayed_job "
+
+      commands.each do |cmd, description|
+
+        desc "@#{app_mode} #{description}"
+        task cmd do
+          s = "#{cmd_base} #{cmd}"
+          options_str = ENV['OPTIONS']
+          unless options_str.nil? || options_str.empty?
+            s << " " << options_str
+          end
+          app_options_str = ENV['APP_OPTIONS']
+          unless app_options_str.nil? || app_options_str.empty?
+            s << " -- " << app_options_str
+          end
+          system_at_vendor_fontana!(s)
+        end
+      end
+
+      desc "show help"
+      task :help do
+        # script/delayed_job --help が exitstatus が 0 でないので明示的に無視します
+        system_at_vendor_fontana!("#{cmd_base} script/delayed_job --help; echo ''")
+      end
+
+    end
+  end
+end

data/lib/fontana_client_support/tasks/factory_girl.rake

@@ -0,0 +1,18 @@
+require 'fontana_client_support'
+include Fontana::ServerRake
+
+namespace_with_fontana :factory_girl, :"app_seed:generate" do
+
+  # desc "generate spec/support/models files"
+  fontana_task :spec_support_models, env: {
+    "SPEC_SUPPORT_MODELS_DIR" => File.expand_path("spec/support/models", FontanaClientSupport.root_dir)
+  }
+
+  # desc "generate spec/factories files"
+  fontana_task :spec_factories, env: {
+    "SPEC_FACTORIES_DIR" => File.expand_path("spec/factories", FontanaClientSupport.root_dir)
+  }
+end
+
+desc "generate spec/support/models files and spec/factories files"
+task :factory_girl => [:"factory_girl:spec_support_models", :"factory_girl:spec_factories"]

data/lib/fontana_client_support/tasks/vendor_fontana.rake

@@ -14,19 +14,16 @@ namespace :vendor do
       d = FontanaClientSupport.vendor_fontana
       if Dir.exist?(d)
         Dir.chdir(d) do
-          # log = `git log -1 --decorate --branches --tags` # これだと現在のコミットが先頭にならない
-          log = `git log -1 --decorate --oneline`
-          if t = log.split(/\s*,\s*/).detect{|s| s =~ /\Atag:\s*v?\d+\.\d+\.\d+/}
-            t.split(/\s*:\s*/, 2).last
-          else
-            nil
-          end
+          # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
+          s = `git describe --tags`
+          s.scan(/\A(v\d+\.\d+\.\d+)/).flatten.first
         end
       end
     end
 
     def vendor_fontana_branch
-      `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
+      # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
+      `git symbolic-ref --short HEAD`.strip
     end
 
     def raise_if_fontana_branch_empty

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,8 +110,10 @@ files:
 - lib/fontana_client_support/tasks/app_seed.rake
 - lib/fontana_client_support/tasks/config_server.rake
 - lib/fontana_client_support/tasks/db.rake
+- lib/fontana_client_support/tasks/delayed_job.rake
 - lib/fontana_client_support/tasks/deploy/scm.rake
 - lib/fontana_client_support/tasks/deploy/sync.rake
+- lib/fontana_client_support/tasks/factory_girl.rake
 - lib/fontana_client_support/tasks/fixtures.rake
 - lib/fontana_client_support/tasks/init.rake
 - lib/fontana_client_support/tasks/server.rake