hieraviz 0.1.2 → 0.2.0

data/spec/lib/facts_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Hieraviz::Facts do
-
-  let(:tmpdir) { "spec/files/tmp" }
-  let(:base) { "base" }
-  let(:node) { "node" }
-  let(:user) { "dummy" }
+  let(:tmpdir) { 'spec/files/tmp' }
+  let(:base) { 'base' }
+  let(:node) { 'node' }
+  let(:user) { 'dummy' }
   let(:facts) { Hieraviz::Facts.new tmpdir, base, node, user }
-  let(:expected) { "spec/files/tmp/base__node__dummy" }
+  let(:expected) { 'spec/files/tmp/base__node__dummy' }
 
   describe '.new' do
     it { expect(facts.instance_variable_get(:@filename)).to eq expected }
@@ -32,10 +31,14 @@ describe Hieraviz::Facts do
   end
 
   describe '.read' do
-    let(:data) { { a: 'b'} }
-    before { facts.write(data) }
-    after  { File.unlink expected }
-    it { expect(facts.read).to eq data }
+    context 'when there is facts recorded' do
+      let(:data) { { a: 'b' } }
+      before { facts.write(data) }
+      after  { File.unlink expected }
+      it { expect(facts.read).to eq data }
+    end
+    context 'when there is no facts recorded' do
+      it { expect(facts.read).to eq({}) }
+    end
   end
-
 end

data/spec/lib/puppetdb_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Hieraviz::Puppetdb do
+  let(:ppdb) { Hieraviz::Puppetdb.new({}) }
+
+  describe '.new' do
+    it { expect(ppdb.instance_variable_get(:@request)).to be_a Hieracles::Puppetdb::Request }
+  end
+
+  describe '.events' do
+    before do
+      allow_any_instance_of(Hieracles::Puppetdb::Request)
+        .to receive(:events)
+        .and_return('something')
+    end
+    it { expect(ppdb.events).to eq 'something' }
+  end
+end

data/spec/lib/store_spec.rb

@@ -3,22 +3,26 @@ require 'fileutils'
 
 describe Hieraviz::Store do
 
+  let(:store) { Hieraviz::Store.new('spec/files/tmp') }
+
   describe '.data' do
-    it { expect(Hieraviz::Store.data).to eq Hash.new }
+    it { expect(store.data).to eq({}) }
   end
 
   describe '.set' do
     let(:name) { '123456' }
     let(:value) { { a: 1 } }
     let(:tmpfile) { 'spec/files/tmp/123456' }
+    before do
+      store.set name, value
+    end
     after do
       File.unlink(tmpfile) if File.exist?(tmpfile)
     end
-    it {
-      Hieraviz::Store.set name, value
+    it do
       expect(File).to exist tmpfile
-      expect(Hieraviz::Store.data[name]).to eq value
-    }
+      expect(store.data[name]).to eq value
+    end
   end
 
   describe '.get' do
@@ -28,38 +32,38 @@ describe Hieraviz::Store do
     after do
       File.unlink(tmpfile) if File.exist?(tmpfile)
     end
-    context "without expiration and existing session" do
+    context 'without expiration and existing session' do
       before do
-        Hieraviz::Store.set name, value
+        store.set name, value
       end
-      it {
-        expect(Hieraviz::Store.get(name)).to eq value
+      it do
+        expect(store.get(name, false)).to eq value
         expect(File).to exist tmpfile
-      }
+      end
     end
-    context "with expiration and existing unexpired session" do
+    context 'with expiration and existing unexpired session' do
       before do
-        Hieraviz::Store.set name, value
+        store.set name, value
       end
-      it {
-        expect(Hieraviz::Store.get(name, 300)).to eq value
+      it do
+        expect(store.get(name, 300)).to eq value
         expect(File).to exist tmpfile
-      }
+      end
     end
-    context "with expiration and existing expired session" do
+    context 'with expiration and existing expired session' do
       before do
-        Hieraviz::Store.set name, value
+        store.set name, value
         FileUtils.touch tmpfile, mtime: Time.now - 600
       end
-      it {
-        expect(Hieraviz::Store.get(name, 300)).to be_falsey
+      it do
+        expect(store.get(name, 300)).to eq({})
         expect(File).not_to exist tmpfile
-      }
+      end
     end
-    context "without existing session" do
-      it {
-        expect(Hieraviz::Store.get(name)).to be_falsey
-      }
+    context 'without existing session' do
+      it do
+        expect(store.get(name, false)).to eq({})
+      end
     end
   end
 
@@ -71,40 +75,31 @@ describe Hieraviz::Store do
     after do
       File.unlink(tmpfile) if File.exist?(tmpfile)
     end
-    it {
-      Hieraviz::Store.set name, value
+    it do
+      store.set name, value
       expect(File).to exist tmpfile
-      expect(Hieraviz::Store.dump).to eq expected
-    }
+      expect(store.dump).to eq expected
+    end
   end
 
   describe '.tmpfile' do
-    context "when the filename has weird chars" do
+    context 'when the filename has weird chars' do
       let(:name) { 'gdahsj#@!(scg78ud' }
       let(:expected) { 'spec/files/tmp/gdahsjscg78ud' }
-      it { expect(Hieraviz::Store.tmpfile(name)).to eq expected }
+      it { expect(store.tmpfile(name)).to eq expected }
     end
-    context "when the filename is a normal hash" do
+    context 'when the filename is a normal hash' do
       let(:name) { 'gdahsjscg78ud' }
       let(:expected) { 'spec/files/tmp/gdahsjscg78ud' }
-      it { expect(Hieraviz::Store.tmpfile(name)).to eq expected }
-    end
-  end
-
-  describe '.tmpdir' do
-    let(:tmpdir_ok) { 'spec/files/tmp' }
-    before do
-      allow(Hieraviz::Config).to receive(:load).and_return({ 'tmpdir' => tmpdir_ok })
+      it { expect(store.tmpfile(name)).to eq expected }
     end
-    it { expect(Hieraviz::Store.tmpdir).to eq tmpdir_ok }
   end
 
   describe '.init_tmpdir' do
-    context 'when specified tmp dir is not present, create it' do 
+    context 'when specified tmp dir is not present, create it' do
       let(:tmpdir_nodir) { File.expand_path('../../files/tmp_tmp', __FILE__) }
       before do
-        allow(Hieraviz::Config).to receive(:load).and_return({ 'tmpdir' => tmpdir_nodir })
-        tmpexpect = Hieraviz::Store.init_tmpdir
+        store.init_tmpdir tmpdir_nodir
       end
       after do
         FileUtils.rm_rf(tmpdir_nodir) if Dir.exist?(tmpdir_nodir)
@@ -113,15 +108,11 @@ describe Hieraviz::Store do
     end
     context 'when tmp dir is present, returns its value' do
       let(:tmpdir_ok) { 'spec/files/tmp' }
-      it { expect(Hieraviz::Store.init_tmpdir).to eq tmpdir_ok }
+      it { expect(store.init_tmpdir tmpdir_ok).to eq tmpdir_ok }
     end
     context 'when tmp dir is absent and cannot be created, returns /tmp' do
       let(:tmpdir_nowrite) { '/diuyao' }
-      before do
-        allow(Hieraviz::Config).to receive(:load).and_return({ 'tmpdir' => tmpdir_nowrite })
-      end
-      it { expect(Hieraviz::Store.init_tmpdir).to eq '/tmp' }
+      it { expect(store.init_tmpdir tmpdir_nowrite).to eq '/tmp' }
     end
   end
-
 end

data/spec/oauth2_helper.rb

@@ -1,8 +1,9 @@
 class AuthCodeMock
-  def authorize_url(args)
+  def authorize_url(_args)
     'authorize url'
   end
-  def get_token(code, args)
+
+  def get_token(_code, _args)
     '123456'
   end
 end
@@ -11,6 +12,7 @@ class RequestMock
   def body
     '{"somekey":"somevalue"}'
   end
+
   def url
     'http://example.com'
   end
@@ -25,7 +27,7 @@ end
 
 class Oauth2Mock
   attr_reader :auth_code
-  def initialize(*args)
+  def initialize(*_args)
     @auth_code = AuthCodeMock.new
   end
 end

data/spec/sinatra_helper.rb

@@ -1,5 +1,3 @@
-ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../files/config.yml', __FILE__
-
 require 'spec_helper'
 
 require File.expand_path '../../app/main.rb', __FILE__
@@ -8,11 +6,11 @@ require 'sinatra/base'
 
 module RSpecMixin
   include Rack::Test::Methods
-  def app() 
+  def app
     described_class
   end
 end
 
-RSpec.configure do |config| 
+RSpec.configure do |config|
   config.include RSpecMixin
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-if !ENV['BUILD']
+unless ENV['BUILD']
   require 'rubygems'
   require 'bundler'
 
@@ -23,9 +23,11 @@ require 'rack/test'
 require 'rspec'
 
 ENV['RACK_ENV'] = 'test'
-# ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../files/config.yml', __FILE__
+ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../files/config.yml', __FILE__
 
-RSpec.configure do |config| 
+require 'hieraviz'
+
+RSpec.configure do |config|
   config.mock_with :rspec
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -35,15 +37,15 @@ end
 module Rack
   module Test
     class Session
-      alias_method :old_env_for, :env_for
+      alias old_env_for env_for
       def rack_session
         @rack_session ||= {}
       end
-      def rack_session=(hash)
-        @rack_session = hash
-      end
+
+      attr_writer :rack_session
+
       def env_for(path, env)
-        old_env_for(path, env).merge({'rack.session' => rack_session})
+        old_env_for(path, env).merge('rack.session' => rack_session)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -206,10 +206,53 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "Simple web application for accessing Puppet development code \n                          and
-  production data in a unified interface. Its main goal is \n                          to
-  enable a better visibility on the Puppet architecture for \n                          more
-  actors to be able to interact with it."
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |-
+  Simple web application for accessing Puppet development code
+                            and production data in a unified interface. Its main goal is
+                            to enable a better visibility on the Puppet architecture for
+                            more actors to be able to interact with it.
 email:
 - mose@gandi.net
 executables:
@@ -255,8 +298,10 @@ files:
 - lib/hieraviz/facts.rb
 - lib/hieraviz/puppetdb.rb
 - lib/hieraviz/store.rb
+- lib/hieraviz/utilities.rb
 - lib/hieraviz/version.rb
 - spec/app/apiv1_spec.rb
+- spec/app/web_dummy_auth_spec.rb
 - spec/app/web_spec.rb
 - spec/files/config.yml
 - spec/files/config_dummy.yml
@@ -278,6 +323,7 @@ files:
 - spec/lib/auth_gitlab_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/facts_spec.rb
+- spec/lib/puppetdb_spec.rb
 - spec/lib/store_spec.rb
 - spec/oauth2_helper.rb
 - spec/sinatra_helper.rb
@@ -303,34 +349,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Web and API server for accessing Puppet dev and prod data.
 test_files:
 - spec/oauth2_helper.rb
-- spec/spec_helper.rb
-- spec/app/apiv1_spec.rb
-- spec/app/web_spec.rb
-- spec/files/config_gitlab.yml
-- spec/files/config_multi.yml
-- spec/files/hiera.yml
 - spec/files/config_dummy.yml
+- spec/files/hiera.yml
 - spec/files/config.yml
-- spec/files/puppet/params/common/common.yaml
-- spec/files/puppet/params/nodes/node1.example.com.yaml
-- spec/files/puppet/enc/node1.example.com.yaml
-- spec/files/puppet/farm_modules/farm1/manifests/init.pp
-- spec/files/puppet/modules/module1/init.pp
-- spec/files/puppet/hiera.yml
-- spec/files/puppet2/params/common/common.yaml
-- spec/files/puppet2/params/nodes/node1.example.com.yaml
-- spec/files/puppet2/enc/node1.example.com.yaml
 - spec/files/puppet2/farm_modules/farm1/manifests/init.pp
-- spec/files/puppet2/modules/module1/init.pp
 - spec/files/puppet2/hiera.yml
-- spec/sinatra_helper.rb
+- spec/files/puppet2/enc/node1.example.com.yaml
+- spec/files/puppet2/params/nodes/node1.example.com.yaml
+- spec/files/puppet2/params/common/common.yaml
+- spec/files/puppet2/modules/module1/init.pp
+- spec/files/config_gitlab.yml
+- spec/files/config_multi.yml
+- spec/files/puppet/farm_modules/farm1/manifests/init.pp
+- spec/files/puppet/hiera.yml
+- spec/files/puppet/enc/node1.example.com.yaml
+- spec/files/puppet/params/nodes/node1.example.com.yaml
+- spec/files/puppet/params/common/common.yaml
+- spec/files/puppet/modules/module1/init.pp
+- spec/spec_helper.rb
 - spec/lib/auth_gitlab_spec.rb
 - spec/lib/config_spec.rb
-- spec/lib/facts_spec.rb
 - spec/lib/store_spec.rb
+- spec/lib/facts_spec.rb
+- spec/lib/puppetdb_spec.rb
+- spec/sinatra_helper.rb
+- spec/app/web_spec.rb
+- spec/app/web_dummy_auth_spec.rb
+- spec/app/apiv1_spec.rb