arethusa-cli 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40fe46d953a6a260beb024a887790f1d16d4778f
-  data.tar.gz: 6ebc44c61bf5d4db3e31368f11bf230e684b6f10
+  metadata.gz: fc7f357cb5235ac1a8e16c9533872fd408c5243b
+  data.tar.gz: 827eaef778acb46bd25f15d3ec2b7392ac369878
 SHA512:
-  metadata.gz: 49a514ca3627f40574d55973aaf82a5bb9c045a4532f87a28370c79570f47ffbb15baf6992c4a3b6da30cffa7c6f6b8a4eda8e8f3c31ef899eb61c9891ab0f08
-  data.tar.gz: 5effd3f79a7785b60ac6c4291d02acf2cfa96aa1101578568f2191aaddda3c25fbac876f6001d3a546077e112902dabfe2f837853c9b43a631447e685be16983
+  metadata.gz: 85dec8a9065456cf09035825f0cf00e74aff9305faac11312e3687fff7d55cf40c337c9d71db5a4338d354404e5ea5d7864db917c0035858ac779640638eb3ba
+  data.tar.gz: de021d29e50517fe27e6741b4989f2c0a982276d4cc059eadad841fd585a4e71d156bd411b274dca40ffb26b0c0ca86ad4cbd6dbfd4f4ae1ceaa69a00a5f2d43

data/lib/arethusa/cli/version.rb

@@ -1,5 +1,5 @@
 module Arethusa
   class CLI
-    VERSION = "0.0.12"
+    VERSION = "0.1.0"
   end
 end

data/lib/arethusa/cli.rb

@@ -67,7 +67,7 @@ EOF
       desc: 'Print the resulting JSON minified'
     def merge(file)
       @conf = read_conf(file)
-      @conf_dir = options[:base_path] || app_dir
+      @conf_dir = options[:base_path] || config_dir
       traverse_and_include(@conf)
 
       if options[:minify]
@@ -150,8 +150,8 @@ EOF
       end
 
       # methods for merging
-      def app_dir
-        "app"
+      def config_dir
+        "app/static/configs"
       end
 
       def traverse_and_include(conf)
@@ -165,7 +165,7 @@ EOF
         clone.each do |key, value|
           if value.is_a?(Hash)
             traverse(conf[key])
-          elsif key == 'fileUrl'
+          elsif key == '@include'
             additional_conf = read_conf(value)
             conf.delete(key)
             conf.merge!(additional_conf)

metadata

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