fontana_client_support 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYzNjM1NGZlYmU1ZDAzYzVhNGViNmYzYmQ5Mzg2ZjVhZjZjMDBiZg==
+    ZTZhZWVhYzllN2JjM2FlYjcxMGRiMTVhM2RiNzhlODZkZmI5MGM3ZQ==
   data.tar.gz: !binary |-
-    OWM2ZDk0MDBlZTkzYWFiZGQ0MTFkZmMzMDRlYjdkYmYzNTk0ZWZjZA==
+    ZWRhNjY1MTkyZDM1YWI5MjE0Yjk0ZWMwNzQxZWRiYTBlZGM1ZjlmZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDIyMDRmZTViMjlhOWE4ZWVjZDQ1ODdlMzY0Njk0NjE3OTVhYzU1YzgyNzFj
-    YjMwNTQ4YmU3ODMwNDljYjA3MDVkMDViNTFmODVkMjM5ZmFhNDRhOGZhMjU0
-    NGE0N2YwODMzNjIxZWJiMGI2YTEzNzRmN2U4MThmMWQ0ODlhMzM=
+    YTBjMGNhZGQ0N2IwZDdkM2M2ZWY1ZDg4M2U1MzE2MDM5MDdjNDhiMTQ0ZGU1
+    ZDA0ZjAyMDI4YTUzYWY2ZTI1NTgwN2JhNGFkN2Y2OGUxNWRlMDI0OTE2NGMy
+    Y2FhNmEyODI2ZDIxMjk4NzA4YWJhYzVjODM0OTg3YTkzZTE2M2E=
   data.tar.gz: !binary |-
-    ZTY1MDE4ZWM0Y2E5MzAzYTk4MjAzNDU0Njk1Y2UyOTMwZDUwZDI4MGNiNWEz
-    ZmQ3OTVlMmNkZmNjYzU2ODM0ZjkzZTc3MTcwMzI3MDczZWUxMWI0ZTBmZGU3
-    YzhmNTAwMmNjODM5Zjk3ODRjNjI0NjdkYzQ3YjZmZjc5OTYwZGY=
+    NGFiZDE2MGE2ZGQwNTdmZTVlYmVkZjQxZmY3OTgyYTRiMTBjMjdkODc4ZWEy
+    Y2VlNjRiNDQ1OWM4MzUxODJhZjk5NjVjOWI2NDg3M2QzNjcyN2NhZDZmMDZl
+    ZmUxYTc3NWE3MGJiZDQ5OTgxODYyMGE1MjVmZTIyMjEwMDI3ZGE=

data/lib/fontana_client_support/config_server.rb

@@ -14,15 +14,21 @@ module FontanaClientSupport
       require 'webrick'
       root_dir = FontanaClientSupport.root_dir
       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}")
       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")
+          git_dir = File.join(dir, "workspace")
           document_root = File.join(dir, "document_root")
           FileUtils.cp_r(document_root_source, document_root)
         end
 
+        $stdout.puts("document_root        : #{document_root.inspect}")
+        $stdout.puts("git_dir              : #{git_dir.inspect}")
+
         server_config = {
           :DocumentRoot => document_root,
           :BindAddress => @config[:address] || ENV['GSS_CONFIG_SERVER_ADDRESS'],
@@ -31,19 +37,39 @@ module FontanaClientSupport
         server = WEBrick::HTTPServer.new(server_config)
         if FontanaClientSupport.root_dir
           server.mount_proc('/switch_config_server') do |req, res|
+            buf = []
             unless Dir.exist?(git_dir)
-              FileUtils.cp_r(root_dir, git_dir)
+              if git_repo_url = @config[:git_repo_url] || ENV['GSS_CONFIG_SERVER_REPO_URL']
+                Dir.chdir(dir) do
+                  cmd = "git clone #{git_repo_url} #{File.basename(git_dir)}"
+                  if system(cmd)
+                    buf << "SUCCESS: #{cmd}"
+                  else
+                    buf << "ERROR: #{cmd}"
+                  end
+                end
+              else
+                FileUtils.cp_r(root_dir, git_dir)
+                buf << "SUCCESS: cp -r #{root_dir} #{git_dir}"
+              end
             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)
+            if tag.nil? || tag.empty?
+              bug << "no tag or SHA1 given"
+            else
+              Dir.chdir(git_dir) do
+                if system("git reset --hard #{tag}")
+                  FileUtils.rm_rf(document_root)
+                  FileUtils.cp_r(File.join(git_dir, "config_server"), document_root)
+                  buf << "SUCCESS"
+                else
+                  buf << "ERROR if you use in submodule, set $GSS_CONFIG_SERVER_REPO_URL.\nlike this:\n$ rake config_server:launch GSS_CONFIG_SERVER_PORT=3002 GSS_CONFIG_SERVER_REPO_URL=git@github.com:groovenauts/fontana_sample.git"
+                end
+              end
             end
-            res.body = Dir["#{document_root}/**/*"].to_a.join("\n  ")
+            res.body = (buf + ["", "files: "] + Dir["#{document_root}/**/*"].to_a).join("\n  ")
           end
         end
-        puts "config_server options: #{@config.inspect}"
         Signal.trap(:INT){ server.shutdown }
         server.start
       end

data/lib/fontana_client_support/version.rb

@@ -1,3 +1,3 @@
 module FontanaClientSupport
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontana_client_support
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - akima