hieracles 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9456a3fe61cef7f54210ecd5d1c0db375afce266
-  data.tar.gz: 4d7563bd18c44b03267bf19bfecf6c8f90d5c7c4
+  metadata.gz: 9a85430681b128f7d7d677ced8d3a826b95ea42b
+  data.tar.gz: 7ada85e7170ed548503c90e42a857bda38770cc2
 SHA512:
-  metadata.gz: dafdb9eb00ae8883c9a365724e86af97e819bcb70ea774a00342fb0d7cb2e6231eb1b9df1be562ef3bf88cd444524deebfb50e80c59d77335f8f0aa8935dfb16
-  data.tar.gz: faf09ad63a05cd373e8fd7a1a2f13f772580dca3f1a3b34efe599b9d20d6f5493c268236c6c945798bd131bf040c60dbeea83deed892806d7ffbebfa9d2e6d3c
+  metadata.gz: 85178885c1f4a84dddf34f9e0bed2fbb70e688340360773ab99937c052c9f3bf96b16af6111fcb2acfd711d218b7253a76fed0add77f71aa6fb0278da27d9c8c
+  data.tar.gz: d7913dcc5d768381888148244e501d9a8c4e01b79f8fe7f6d31d3a1021e0a1ccc1167e4cb7e3b8114f81999b2b9e7e1f5f3b02c5307b1f94e379b3d74643d1f3

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 Hieracles Changelog
 =======================
 
-### 0.0.2 - 2016-09-16
+### 0.0.3 - 2015-09-21
+- preparing hieracles to be packageable for debian
+
+### 0.0.2 - 2015-09-16
 - added `yaml` format including comments about where the params is defined
 - the uncommented yaml is now the format `rawyaml`
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'rspec/core/rake_task'
 desc 'launch rspec tests'
 task :spec do
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = ['-c', '-f Fivemat', '-r ./spec/spec_helper.rb']
+    t.rspec_opts = ['-c', '-f progress', '-r ./spec/spec_helper.rb']
     t.pattern = 'spec/lib/**/*_spec.rb'
   end
 end

data/lib/hieracles/formats/rawyaml.rb

@@ -27,10 +27,6 @@ module Hieracles
         @node.params_tree(false).to_yaml
       end
 
-      def modules(args)
-        @node.modules.to_yaml
-      end
-
     end
   end
 end

data/lib/hieracles/formats/yaml.rb

@@ -27,11 +27,6 @@ module Hieracles
         commented_yaml_tree(false)
       end
 
-      def modules(args)
-        @node.modules.to_yaml
-      end
-
-
       def commented_yaml_tree(without_common = true)
         tree = @node.params_tree(without_common)
         params = Hash[@node.params(without_common)]
@@ -40,26 +35,31 @@ module Hieracles
 
       def mergetree(output, key, leaf, params)
         indent = '  ' * key.count
-        case leaf.class.name
-        when 'Hash'
-          leaf.each do |k, v|
-            output += "\n" + indent + k + ': '
-            output = mergetree(output, key + [k], v, params)
-          end
-        when 'Array'
-          yaml = leaf.to_yaml[4..-1]
-          aryaml = yaml.each_line.map do |l|
-            indent + l
-          end
-          output += "\n" + indent + "# " + params[key.join('.')][0][:file]
-          output += "\n" + aryaml.join().chomp
-        when 'String'
-          output += leaf
-          if params["#{key.join('.')}"]
-            output += " # " + params[key.join('.')][0][:file]
-          else
-            raise "#{key}"
-          end
+        send("add_#{leaf.class.name.downcase}".to_sym, output, key, leaf, params, indent)
+      end
+
+      def add_hash(output, key, leaf, params, indent)
+        leaf.each do |k, v|
+          output += "\n" + indent + k + ': '
+          output = mergetree(output, key + [k], v, params)
+        end
+        output
+      end
+
+      def add_array(output, key, leaf, params, indent)
+        yaml = leaf.to_yaml[4..-1]
+        aryaml = yaml.each_line.map do |l|
+          indent + l
+        end
+        output += "\n" + indent + "# " + params[key.join('.')][0][:file]
+        output += "\n" + aryaml.join().chomp
+        output        
+      end
+
+      def add_string(output, key, leaf, params, indent)
+        output += leaf
+        if params["#{key.join('.')}"]
+          output += " # " + params[key.join('.')][0][:file]
         end
         output
       end

data/spec/lib/formats/rawyaml_spec.rb

@@ -14,9 +14,7 @@ describe Hieracles::Formats::Rawyaml do
         }
       )
     }
-    it "outputs proper text" do
-      expect(yaml_format.info nil).to eq expected
-    end
+    it { expect(yaml_format.info nil).to eq expected }
   end
 
   describe ".files" do
@@ -24,9 +22,7 @@ describe Hieracles::Formats::Rawyaml do
     before {
       allow(node).to receive(:files).and_return(['path1', 'path2'])
     }
-    it "outputs proper text" do
-      expect(yaml_format.files nil).to eq expected
-    end
+    it { expect(yaml_format.files nil).to eq expected }
   end
 
   describe ".paths" do
@@ -34,12 +30,11 @@ describe Hieracles::Formats::Rawyaml do
     before {
       allow(node).to receive(:paths).and_return(['path1', 'path2'])
     }
-    it "outputs proper text" do
-      expect(yaml_format.paths nil).to eq expected
-    end
+    it { expect(yaml_format.paths nil).to eq expected }
   end
 
   describe ".modules" do
+    let(:expected) { "---\nmodule1: value\nlongmodule2: not found\n" }
     before {
       allow(node).to receive(:modules).and_return(
         { 
@@ -48,13 +43,31 @@ describe Hieracles::Formats::Rawyaml do
         }
       )
     }
-    let(:expected) { "---\nmodule1: value\nlongmodule2: not found\n" }
-    it "outputs proper text" do
-      expect(yaml_format.modules nil).to eq expected
-    end
+    it { expect(yaml_format.modules nil).to eq expected }
   end
 
   describe ".params" do
+    let(:expected) { 
+       "---\n" +
+       "params:\n" +
+       "  this:\n" +
+       "    var: value1\n"
+    }
+    before {
+      allow(node).to receive(:params_tree).and_return(
+        { 
+          'params' => {
+            'this' => {
+              'var' => 'value1'
+            }
+          }
+        }
+      )
+    }
+    it { expect(yaml_format.params nil).to eq expected }
+  end
+
+  describe ".allparams" do
     let(:expected) { 
        "---\n"+
        "params:\n" +
@@ -72,8 +85,7 @@ describe Hieracles::Formats::Rawyaml do
         }
       )
     }
-    it "outputs proper text" do
-      expect(yaml_format.params nil).to eq expected
-    end
+    it { expect(yaml_format.allparams nil).to eq expected }
   end
+
 end

data/spec/lib/formats/yaml_spec.rb

@@ -14,9 +14,7 @@ describe Hieracles::Formats::Yaml do
         }
       )
     }
-    it "outputs proper text" do
-      expect(yaml_format.info nil).to eq expected
-    end
+    it { expect(yaml_format.info nil).to eq expected }
   end
 
   describe ".files" do
@@ -24,9 +22,7 @@ describe Hieracles::Formats::Yaml do
     before {
       allow(node).to receive(:files).and_return(['path1', 'path2'])
     }
-    it "outputs proper text" do
-      expect(yaml_format.files nil).to eq expected
-    end
+    it { expect(yaml_format.files nil).to eq expected }
   end
 
   describe ".paths" do
@@ -34,12 +30,11 @@ describe Hieracles::Formats::Yaml do
     before {
       allow(node).to receive(:paths).and_return(['path1', 'path2'])
     }
-    it "outputs proper text" do
-      expect(yaml_format.paths nil).to eq expected
-    end
+    it { expect(yaml_format.paths nil).to eq expected }
   end
 
   describe ".modules" do
+    let(:expected) { "---\nmodule1: value\nlongmodule2: not found\n" }
     before {
       allow(node).to receive(:modules).and_return(
         { 
@@ -48,13 +43,39 @@ describe Hieracles::Formats::Yaml do
         }
       )
     }
-    let(:expected) { "---\nmodule1: value\nlongmodule2: not found\n" }
-    it "outputs proper text" do
-      expect(yaml_format.modules nil).to eq expected
-    end
+    it { expect(yaml_format.modules nil).to eq expected }
   end
 
   describe ".params" do
+    let(:expected) { 
+       "---\n" +
+       "params: \n" +
+       "  this: \n" +
+       "    var: value1 # some/file"
+    }
+    before {
+      allow(node).to receive(:params).and_return(
+        { 
+          'params.this.var' => [{
+            file: 'some/file',
+            value: 'value1'
+          }]
+        }
+      )
+      allow(node).to receive(:params_tree).and_return(
+        { 
+          'params' => {
+            'this' => {
+              'var' => 'value1'
+            }
+          }
+        }
+      )
+    }
+    it { expect(yaml_format.params nil).to eq expected }
+  end
+
+  describe ".allparams" do
     let(:expected) { 
        "---\n"+
        "params: \n" +
@@ -80,9 +101,7 @@ describe Hieracles::Formats::Yaml do
         }
       )
     }
-    it "outputs proper text" do
-      expect(yaml_format.params nil).to eq expected
-    end
+    it { expect(yaml_format.allparams nil).to eq expected }
   end
 
   describe '.mergetree' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,6 @@ files:
 - README.md
 - Rakefile
 - bin/hc
-- bin/nodeinfo
 - hieracles.gemspec
 - lib/hieracles.rb
 - lib/hieracles/config.rb
@@ -175,6 +174,7 @@ files:
 - spec/lib/utils_spec.rb
 - spec/spec_helper.rb
 - tools/completion/_hc
+- tools/nodeinfo
 homepage: https://github.com/Gandi/hieracles
 licenses:
 - MIT
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CLI tool for Hiera parameters visualisation.