hieracles 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eaabaf9bb23726ac33f23fed83dc3f52983e4ee
-  data.tar.gz: 11cbdfdca5bc942d1fc84b36273f1ac6c9447303
+  metadata.gz: c192a57c0dd89751f2e3bfb54cbe618619a86899
+  data.tar.gz: c912bca31c59ade51a5406afd7a6d0694f0b14c3
 SHA512:
-  metadata.gz: e20bbd06da0d72acde4f62a82f4202369b6890c640cc9f2b30e01cbcbecc87b5d23be3ee68259f3ec11f4a80d7c54698a6904a8559f34b33481fd9b9a46f9679
-  data.tar.gz: 4afac468de65f1797303e66d5ba32e1d9006797c7a7cec000c30b8fda1c09370f77e424545715b529c6c86e0fe5f0f7ea927e29f99dc4e18cac433669dd93b4b
+  metadata.gz: c04d028ce1dde5e210085724be74031dbe8792b55bf320fe172a93d01a5613c76599d76b36ad3b59efe7e2a7db6e6d98bd34b944f7bf3609c37d4af6f5fd5960
+  data.tar.gz: ba1cbd0281931e8ecd799d6f91334afde0cf0ead9e5e1ccb9cc4ca801a150aa43d2ebb2523295b9f14e74662e744b8c49ae03f24c0efcf02af1e0cc91213ab8c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Hieracles Changelog
 =======================
 
+### 0.1.1 - 2015-11-11
+- add json format output
+- add an option to load facts files in json or yaml
+- fix yaml output when there is a fixnum or a float in yaml
+
 ### 0.1.0 - 2015-11-10
 - display full local path in params output
 - add an option to display version

data/README.md

@@ -4,7 +4,7 @@ Hieracles
 [![Gem Version](https://img.shields.io/gem/v/hieracles.svg)](http://rubygems.org/gems/hieracles)
 [![Downloads](http://img.shields.io/gem/dt/hieracles.svg)](https://rubygems.org/gems/hieracles)
 [![Build Status](https://img.shields.io/travis/Gandi/hieracles.svg)](https://travis-ci.org/Gandi/hieracles)
-[![Coverage Status](https://img.shields.io/coveralls/Gandi/hieracles.svg)](https://coveralls.io/r/Gandi/hieracles?branch=master)
+[![Test Coverage](https://img.shields.io/codeclimate/coverage//github/Gandi/hieracles.svg)](https://codeclimate.com/github/Gandi/hieracles/coverage)
 [![Dependency Status](https://img.shields.io/gemnasium/Gandi/hieracles.svg)](https://gemnasium.com/Gandi/hieracles)
 [![Code Climate](https://img.shields.io/codeclimate/github/Gandi/hieracles.svg)](https://codeclimate.com/github/Gandi/hieracles)
 
@@ -54,7 +54,6 @@ For an  example setup you can check in `spec/files`.
 Usage
 -------------
 
-
     Usage: hc <fqdn> <command> [extra_args]
 
     Available commands:
@@ -74,13 +73,27 @@ Usage
                   Also accepts a search string
 
     Extra args:
-      -f <plain|console|csv|yaml|rawyaml> - default console
+      -f <plain|console|csv|yaml|rawyaml|json> - default console
       -p extraparam=what;anotherparam=this 
       -c <configfile>
       -h <hierafile>
       -b <basepath> default ./
       -e <encdir>
       -v - displays version
+      -y <fact_file> - facts in yaml format
+      -j <fact_file> - facts in json format
+
+
+About facts
+------------------
+
+_(work in progress)_
+
+Like with Hiera CLI you can use hieracles with defined top-scope variables. Those top-scope vars can be defined with:
+
+- `-p extraparam=what;anotherparam=this`
+- `-y <fact_file>` which takes the fact file from a yaml source created by `facter -y` on your node for example, but it can be written manually for experimentation purposes.
+- `-j <fact_file>` same as above, but with output of `facter -j`
 
 Completion
 -------------

data/hieracles.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
                         lib/hieracles/format.rb
                         lib/hieracles/formats/console.rb
                         lib/hieracles/formats/csv.rb
+                        lib/hieracles/formats/json.rb
                         lib/hieracles/formats/plain.rb
                         lib/hieracles/formats/rawyaml.rb
                         lib/hieracles/formats/yaml.rb
@@ -58,6 +59,7 @@ Gem::Specification.new do |spec|
                         spec/lib/format_spec.rb
                         spec/lib/formats/console_spec.rb
                         spec/lib/formats/csv_spec.rb
+                        spec/lib/formats/json_spec.rb
                         spec/lib/formats/plain_spec.rb
                         spec/lib/formats/rawyaml_spec.rb
                         spec/lib/formats/yaml_spec.rb
@@ -76,7 +78,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', "~> 3.0"
-  spec.add_development_dependency 'coveralls'
+  # spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rubocop'
 

data/lib/hieracles/config.rb

@@ -1,11 +1,13 @@
 require 'fileutils'
+require 'json'
+require 'yaml'
 
 module Hieracles
   # configuration singleton
   module Config
     extend self
 
-    attr_reader :extraparams, :server, :classpath, 
+    attr_reader :extraparams, :server, :classpath, :facts,
       :modulepath, :hierafile, :basepath, :encpath, :format
 
     def load(options)
@@ -20,6 +22,9 @@ module Hieracles
       @basepath = File.expand_path(options[:basepath] || values['basepath'] || '.')
       @hierafile = options[:hierafile] || values['hierafile'] || 'hiera.yaml'
       @format = (options[:format] || values['format'] || 'console').capitalize
+      facts_file = options[:yaml_facts] || options[:json_facts]
+      facts_format = options[:json_facts] ? :json : :yaml
+      @facts = (facts_file && load_facts(facts_file, facts_format)) || {}
     end
 
     def initconfig(file)
@@ -52,5 +57,13 @@ module Hieracles
       File.join(@basepath, send(what.to_sym))
     end
 
+    def load_facts(file, format)
+      if format == :json
+        JSON.parse(File.read(file))
+      else
+        YAML.load_file(file)
+      end
+    end
+
   end
 end

data/lib/hieracles/formats/json.rb

@@ -0,0 +1,34 @@
+require 'json/ext'
+
+module Hieracles
+  module Formats
+    # format intended to be used for an api server
+    class Json < Hieracles::Format
+
+      def info(_)
+        @node.info.to_json
+      end
+
+      def files(_)
+        @node.files.to_json
+      end
+
+      def paths(_)
+        @node.paths.to_json
+      end
+
+      def modules(_)
+        @node.modules.to_json
+      end
+
+      def params(args)
+        @node.params(true).to_json
+      end
+
+      def allparams(args)
+        @node.params(false).to_json
+      end
+
+    end
+  end
+end

data/lib/hieracles/formats/yaml.rb

@@ -63,23 +63,29 @@ module Hieracles
       end
 
       def add_string(output, key, leaf, params, indent)
-        output += leaf
-        if params["#{key.join('.')}"]
-          output += " # " + params[key.join('.')][0][:file]
-        end
-        output
+        added output, key, leaf, params
       end
 
       def add_trueclass(output, key, leaf, params, indent)
-        output += 'true'
-        if params["#{key.join('.')}"]
-          output += " # " + params[key.join('.')][0][:file]
-        end
-        output
+        added output, key, 'true', params
       end
 
       def add_falseclass(output, key, leaf, params, indent)
-        output += 'false'
+        added output, key, 'false', params
+      end
+
+      def add_fixnum(output, key, leaf, params, indent)
+        added output, key, leaf, params
+      end
+
+      def add_float(output, key, leaf, params, indent)
+        added output, key, leaf, params
+      end
+
+      private
+
+      def added(output, key, leaf, params)
+        output += leaf.to_s
         if params["#{key.join('.')}"]
           output += " # " + params[key.join('.')][0][:file]
         end

data/lib/hieracles/optparse.rb

@@ -32,6 +32,14 @@ module Hieracles
       version: {
         has_arg: false,
         aliases: ['v', 'version']
+      },
+      yaml_facts: {
+        has_arg: true,
+        aliases: ['y', 'yaml']
+      },
+      json_facts: {
+        has_arg: true,
+        aliases: ['j', 'json']
       }
     }
 

data/lib/hieracles.rb

@@ -7,6 +7,7 @@ require 'hieracles/node'
 require 'hieracles/format'
 require 'hieracles/registry'
 require 'hieracles/formats/csv'
+require 'hieracles/formats/json'
 require 'hieracles/formats/yaml'
 require 'hieracles/formats/plain'
 require 'hieracles/formats/console'

data/spec/lib/config_spec.rb

@@ -60,4 +60,34 @@ describe Hieracles::Config do
     let(:expected) { { bla: 'blu', one: 'two' } }
     it { expect(Hieracles::Config.extract_params(str)).to eq expected }
   end
+
+  describe '.facts' do
+    context 'with a yaml file' do
+      let(:options) do
+        { 
+          config: 'spec/files/config.yml', 
+          basepath: 'spec/files', 
+          yaml_facts: 'spec/files/facts.yaml'
+        }
+      end
+      let(:expected) { 'Debian' }
+      before { Hieracles::Config.load options }
+
+      it { expect(Hieracles::Config.facts['osfamily']).to eq expected }
+    end
+    context 'with a json file' do
+      let(:options) do
+        { 
+          config: 'spec/files/config.yml', 
+          basepath: 'spec/files', 
+          json_facts: 'spec/files/facts.json'
+        }
+      end
+      let(:expected) { 'Debian' }
+      before { Hieracles::Config.load options }
+
+      it { expect(Hieracles::Config.facts['osfamily']).to eq expected }
+    end
+  end
+
 end

data/spec/lib/formats/json_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Hieracles::Formats::Json do
+  let(:node) { double("node") }
+  let(:json_format) { Hieracles::Formats::Json.new node }
+
+  describe ".info" do
+    let(:expected) { '{"Node":"fqdn","Farm":"farm"}' }
+    before {
+      allow(node).to receive(:info).and_return(
+        {
+          'Node' => 'fqdn',
+          'Farm' => 'farm'
+        }
+      )
+    }
+    it { expect(json_format.info nil).to eq expected }
+  end
+
+  describe ".files" do
+    let(:expected) { '["path1","path2"]' }
+    before {
+      allow(node).to receive(:files).and_return(['path1', 'path2'])
+    }
+    it { expect(json_format.files nil).to eq expected }
+  end
+
+  describe ".paths" do
+    let(:expected) { '["path1","path2"]' }
+    before {
+      allow(node).to receive(:paths).and_return(['path1', 'path2'])
+    }
+    it { expect(json_format.paths nil).to eq expected }
+  end
+
+  describe ".modules" do
+    let(:expected) { "---\nmodule1: value\nlongmodule2: not found\n" }
+    let(:expected) { '{"module1":"value","longmodule2":"not found"}' }
+    before {
+      allow(node).to receive(:modules).and_return(
+        { 
+          'module1' => "value", 
+          'longmodule2' => "not found"
+        }
+      )
+    }
+    it { expect(json_format.modules nil).to eq expected }
+  end
+
+  describe ".params" do
+    let(:expected) { '{"params":{"this":{"var":"value1"}}}' }
+    before {
+      allow(node).to receive(:params).and_return(
+        { 
+          'params' => {
+            'this' => {
+              'var' => 'value1'
+            }
+          }
+        }
+      )
+    }
+    it { expect(json_format.params nil).to eq expected }
+  end
+
+  describe ".allparams" do
+    let(:expected) { '{"params":{"this":{"var":"value1"}}}' }
+    before {
+      allow(node).to receive(:params).and_return(
+        { 
+          'params' => {
+            'this' => {
+              'var' => 'value1'
+            }
+          }
+        }
+      )
+    }
+    it { expect(json_format.allparams nil).to eq expected }
+  end
+
+end

data/spec/lib/formats/yaml_spec.rb

@@ -122,6 +122,74 @@ describe Hieracles::Formats::Yaml do
       }
       it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
     end
+    context "with various boolean type of key-values (true)" do
+      let(:params) {
+        { 
+          'key' => [{
+            file: 'what/file',
+            value: 'value'
+          }]
+        }
+      }
+      let(:input) {
+        { 'key' => true }
+      }
+      let(:expected) {
+        "\nkey: true # what/file"
+      }
+      it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+    end
+    context "with various boolean type of key-values (false)" do
+      let(:params) {
+        { 
+          'key' => [{
+            file: 'what/file',
+            value: 'value'
+          }]
+        }
+      }
+      let(:input) {
+        { 'key' => false }
+      }
+      let(:expected) {
+        "\nkey: false # what/file"
+      }
+      it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+    end
+    context "with various fixnum type of key-values" do
+      let(:params) {
+        { 
+          'key' => [{
+            file: 'what/file',
+            value: 'value'
+          }]
+        }
+      }
+      let(:input) {
+        { 'key' => 3 }
+      }
+      let(:expected) {
+        "\nkey: 3 # what/file"
+      }
+      it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+    end
+    context "with various float type of key-values" do
+      let(:params) {
+        { 
+          'key' => [{
+            file: 'what/file',
+            value: 'value'
+          }]
+        }
+      }
+      let(:input) {
+        { 'key' => 0.3 }
+      }
+      let(:expected) {
+        "\nkey: 0.3 # what/file"
+      }
+      it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+    end
     context "with a simple array key-value" do
       let(:params) {
         { 

data/spec/spec_helper.rb

@@ -1,20 +1,25 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
-# require 'rubygems'
-# require 'bundler'
 
-# if ENV['COV']
-#   require 'simplecov'
-#   SimpleCov.profiles.define :app do
-#     add_group 'bin', '/bin'
-#     add_group 'lib', '/lib'
-#     add_filter '/vendor/'
-#     add_filter '/spec/'
-#   end
-#   SimpleCov.start :app
-# else
-#   require 'coveralls'
-#   Coveralls.wear!
-# end
+if !ENV['BUILD']
+  require 'rubygems'
+  require 'bundler'
+
+  if ENV['COV']
+    require 'simplecov'
+    SimpleCov.profiles.define :app do
+      add_group 'bin', '/bin'
+      add_group 'lib', '/lib'
+      add_filter '/vendor/'
+      add_filter '/spec/'
+    end
+    SimpleCov.start :app
+  else
+    #require 'coveralls'
+    #Coveralls.wear!
+    require "codeclimate-test-reporter"
+    CodeClimate::TestReporter.start
+  end
+end
 
 require 'hieracles'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,6 +114,7 @@ files:
 - lib/hieracles/format.rb
 - lib/hieracles/formats/console.rb
 - lib/hieracles/formats/csv.rb
+- lib/hieracles/formats/json.rb
 - lib/hieracles/formats/plain.rb
 - lib/hieracles/formats/rawyaml.rb
 - lib/hieracles/formats/yaml.rb
@@ -146,6 +147,7 @@ files:
 - spec/lib/format_spec.rb
 - spec/lib/formats/console_spec.rb
 - spec/lib/formats/csv_spec.rb
+- spec/lib/formats/json_spec.rb
 - spec/lib/formats/plain_spec.rb
 - spec/lib/formats/rawyaml_spec.rb
 - spec/lib/formats/yaml_spec.rb
@@ -205,6 +207,7 @@ test_files:
 - spec/lib/format_spec.rb
 - spec/lib/formats/console_spec.rb
 - spec/lib/formats/csv_spec.rb
+- spec/lib/formats/json_spec.rb
 - spec/lib/formats/plain_spec.rb
 - spec/lib/formats/rawyaml_spec.rb
 - spec/lib/formats/yaml_spec.rb