fontana_client_support 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI0ZWNiMzZkZDM1MTgzYWRkNjkyMTc2NTM5NGRiMGE3ODY0OTVlMw==
+    NDA5MjJjNTViZjRiNjk1MmQ0Y2MwOWQyNDcwZTA1MWMxOTU5YjgyZg==
   data.tar.gz: !binary |-
-    ZjlmOTZjYWY5ZDk1YmM2Nzc0OGUyYjkyODZiYzAzN2QxMGVhZGQxOA==
+    NjJkYWE4MTg3MTdmNjg3N2U2ZTJiYTliNjMwZDQ5OWE0MjZkMWM5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODgyNjZlZGE1YjlkMTJjYzE3OTg1MzRjZTUxNDRkZDNlZjE1YzUwOGE2MGY5
-    NjY5M2I2MzRiNjYwZjBhMjE1YmYzYzAwNDFlMGVkYWMzM2FiYzc4NjQ4NTQx
-    NjI4MjNiNTQxNmEyN2MxOTVjYjNiZDI3MmExYmQwOTQ1N2MzZTg=
+    ZjNiNmM0YTUxMjEzMTZjOGU0NjE1ZTc4ZjA1NDkyZTIxNDI4NjlhZTM5ZDNh
+    ZDFmMmZkOWY0MTRkNDBkMzBhY2Y4YTM5OWY0MDczMDQyMmIyMzBlNGFiNmMw
+    M2JmNjBhYTY2NTYzMmNhMGViMTkxZTVjZjg5NWU5ZjRjYmE5YjA=
   data.tar.gz: !binary |-
-    OWE2NzM2YzMxODg1ZDVjZmI5M2YzNmY5Y2Q0MTg0NzcyN2QyODUwYjczYTI3
-    MWNlZGM2MTNlYTAzYmJiMWU2YjljNjRiMGYxOGEyN2I5NGE1ZGY3ODc0NDcz
-    NjlmM2RkYjEyODNjY2Q2YjU4ZTU5OTg2MTY1NzVmNmJkMGU0ZWQ=
+    NzVmNDI5M2UwODQ2NTRhNWYzZDUyMmY2NDVkNjczMTU5NDEzMjI4MTE2Yzc1
+    ZDQ1YWFhZThhNGM3MjU2MWY1NjVkMWVjMTg0OTBkYjE0NTQzOGJkYTRiNDU3
+    MjZiNmRiODU5MTQ2M2M3ZGJkNzdkNGMyYjEzNjJhYjk5ZWMwMjc=

data/bin/fontana_config_server

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+require 'optparse'
+
+default_options = {
+  "port" => 3002,
+}
+banner = "%s [options]" % File.basename(__FILE__)
+parser = OptionParser.new(banner) do |opt|
+  opt.on '-p', '--port PORT'
+  opt.on '-a', "--address BINDING_ADDRESS"
+  opt.on '-d', '--document-root DOCUMENT_ROOT_PATH'
+end
+
+options = default_options.merge(parser.getopts(ARGV))
+options = options.each_with_object({}){|(k,v), d| d[k.gsub(/-/, '_').to_sym] = v}
+
+require 'fontana_client_support'
+FontanaClientSupport::ConfigServer.new(options).launch

data/lib/fontana_client_support/config_server.rb

@@ -1,24 +1,52 @@
 require 'fontana_client_support'
+require 'tmpdir'
+require 'fileutils'
 
 module FontanaClientSupport
   class ConfigServer
 
     # see http://doc.ruby-lang.org/ja/1.9.3/class/WEBrick=3a=3aHTTPServer.html
     def initialize(config = {})
-      @config = {
-        :DocumentRoot => File.join(FontanaClientSupport.root_dir, "config_server"),
-        :BindAddress => ENV['GSS_CONFIG_SERVER_ADDRESS'] || '127.0.0.1',
-        :Port => (ENV['GSS_CONFIG_SERVER_PORT'] || 80).to_i
-      }
-      @config.update(config)
+      @config = config
     end
 
     def launch
       require 'webrick'
-      server = WEBrick::HTTPServer.new(@config)
-      puts "config_server options: #{@config.inspect}"
-      Signal.trap(:INT){ server.shutdown }
-      server.start
+      root_dir = FontanaClientSupport.root_dir
+      document_root_source = @config[:document_root] || root_dir ? File.join(root_dir, "config_server") : "."
+      Dir.mktmpdir("fontana_config_server") do |dir|
+        if @config[:document_root] or root_dir.nil?
+          document_root = document_root_source
+        else
+          git_dir       = File.join(dir, "workspace")
+          document_root = File.join(dir, "document_root")
+          FileUtils.cp_r(document_root_source, document_root)
+        end
+
+        server_config = {
+          :DocumentRoot => document_root,
+          :BindAddress => @config[:address] || ENV['GSS_CONFIG_SERVER_ADDRESS'] || '127.0.0.1',
+          :Port => (@config[:port] || ENV['GSS_CONFIG_SERVER_PORT'] || 80).to_i
+        }
+        server = WEBrick::HTTPServer.new(server_config)
+        if FontanaClientSupport.root_dir
+          server.mount_proc('/switch_config_server') do |req, res|
+            unless Dir.exist?(git_dir)
+              FileUtils.cp_r(root_dir, git_dir)
+            end
+            tag = req.path.sub(%r{\A/switch_config_server/}, '')
+            Dir.chdir(git_dir) do
+              system("git reset --hard #{tag}")
+              FileUtils.rm_rf(document_root)
+              FileUtils.cp_r(File.join(git_dir, "config_server"), document_root)
+            end
+            res.body = Dir["#{document_root}/**/*"].to_a.join("\n  ")
+          end
+        end
+        puts "config_server options: #{@config.inspect}"
+        Signal.trap(:INT){ server.shutdown }
+        server.start
+      end
     end
 
     class << self

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,8 @@ dependencies:
 description: gem to support development and testing with GSS/fontana
 email:
 - t-akima@groovenauts.jp
-executables: []
+executables:
+- fontana_config_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -93,6 +94,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/fontana_config_server
 - fontana_client_support.gemspec
 - lib/fontana.rb
 - lib/fontana/command_utils.rb