arethusa-cli 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11fcf19408f38b511c33177560caae15e237f36f
-  data.tar.gz: b167c4e8f49a6519b7b2becac5f17ba22f150a54
+  metadata.gz: 9ac1bc40b8ef2ef392ada7d3fe4a674e2d568581
+  data.tar.gz: 9c7917a91dd38ca053b7fd5923f78c6e6abf971f
 SHA512:
-  metadata.gz: a9ff6b90537de8daca6860d0f818858682738cd1fadaa1f183d59314d3db98f4f7a940f1f9fb9a1fad7aa331e16915eb33fd4ad788574bd502ed0800dc8aabd2
-  data.tar.gz: 3309e0d573736ead9ed4011aae20c099967be683a7895afd5564504579aac8bc74c8decec91face04788adf0f1a1383f0921b618091978d2ea92a4fc6958c3a3
+  metadata.gz: e78620b35260072614306ad5e1bef3b203e317b5bdd005bd9ac812ef665b2a975c58ac5808ee4f3b61826b8f542eac1ccccf6c7141ed8ef09673b7be28e53b75
+  data.tar.gz: dfa9d3b5fd584b6072cd5f319d53541d7222e4fb0009250d0d2b2ed30858e3de4ba3ae73d00b493545e0c3d9c351ac0d06715493c6358982069d4f19681e3c5d

data/lib/arethusa/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'json'
 
 module Arethusa
   class CLI < Thor
@@ -59,6 +60,14 @@ EOF
       say_status(:deployed, "at #{@address} - #{@directory}")
     end
 
+    desc 'merge FILE', 'Merge Arethusa configuration files'
+    def merge(file)
+      @conf = read_conf(file)
+      traverse_and_include(@conf)
+
+      puts JSON.pretty_generate(@conf, indent: '  ')
+    end
+
     no_commands do
       def minify
         if `grunt minify:css minify`
@@ -130,6 +139,35 @@ EOF
       def commit_sha
         `git rev-parse --short HEAD`.strip
       end
+
+      # methods for merging
+      def app_dir
+        "app"
+      end
+
+      def traverse_and_include(conf)
+        inside app_dir do
+          traverse(conf)
+        end
+      end
+
+      def traverse(conf)
+        clone = conf.clone
+        clone.each do |key, value|
+          if value.is_a?(Hash)
+            traverse(conf[key])
+          elsif key == 'fileUrl'
+            additional_conf = read_conf(value)
+            conf.delete(key)
+            conf.merge!(additional_conf)
+            traverse(additional_conf)
+          end
+        end
+      end
+
+      def read_conf(path)
+        JSON.parse(File.read(path))
+      end
     end
   end
 end

data/lib/arethusa/cli/version.rb

@@ -1,5 +1,5 @@
 module Arethusa
   class CLI
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arethusa-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - LFDM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler