ml-puppetdb-terminus 3.2.1 → 3.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef75c6961820a8af14d7f7c7df0d110a3f28544c
-  data.tar.gz: ed6ce43fc58279145053a35975a24a0eefac5a1c
+  metadata.gz: 78f71318d2680406c718bf146bc777d0a627a883
+  data.tar.gz: 7913086e2e2e49501fac02e9214a8d163e7711b5
 SHA512:
-  metadata.gz: 6b4c36e098603516c63d2c7318cc6fae7f515832e4f7a9bd8814e264414d15a39971b004ad3a12ab635aa0ed227d5bfd3489d95f442c7165432ac9c4cfa9cc26
-  data.tar.gz: e8faa791156b9ae069859c3e61f3bea79cfd6b1520b55bcb7f9b42406e148fc3e5388d47664fda3b07257a35f2aa7d109faa7e5c486f8ddc445d683f9ed948e7
+  metadata.gz: 8fc6bcddb0f083de2544412b0f30e4a7c7abcff6ab815494af881495ff0b85ede1171df7a7f00570d6a4d4f5e12554dda4a7a01709284f54bedf48c6921b7b7f
+  data.tar.gz: cb291f8180d4c9894af37f10cc0e7dd5c3aeb747ae0530e3ec15e6cbd9ac43af60e62dbad5cc355f3c695f04510e9e2f95e5e9045dbb530c11404fa152676eb0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ml-puppetdb-terminus
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.1.1
 platform: ruby
 authors:
 - Mark Lawler
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -54,39 +40,22 @@ files:
 - LICENSE.txt
 - NOTICE.txt
 - README.md
-- puppet/lib/puppet/application/storeconfigs.rb
-- puppet/lib/puppet/face/node/deactivate.rb
-- puppet/lib/puppet/face/node/status.rb
-- puppet/lib/puppet/face/storeconfigs.rb
-- puppet/lib/puppet/indirector/catalog/puppetdb.rb
-- puppet/lib/puppet/indirector/facts/puppetdb.rb
-- puppet/lib/puppet/indirector/facts/puppetdb_apply.rb
-- puppet/lib/puppet/indirector/node/puppetdb.rb
-- puppet/lib/puppet/indirector/resource/puppetdb.rb
-- puppet/lib/puppet/reports/puppetdb.rb
-- puppet/lib/puppet/util/puppetdb.rb
-- puppet/lib/puppet/util/puppetdb/char_encoding.rb
-- puppet/lib/puppet/util/puppetdb/command.rb
-- puppet/lib/puppet/util/puppetdb/command_names.rb
-- puppet/lib/puppet/util/puppetdb/config.rb
-- puppet/lib/puppet/util/puppetdb/http.rb
-- puppet/spec/README.markdown
-- puppet/spec/spec.opts
-- puppet/spec/spec_helper.rb
-- puppet/spec/unit/face/node/deactivate_spec.rb
-- puppet/spec/unit/face/node/status_spec.rb
-- puppet/spec/unit/face/storeconfigs_spec.rb
-- puppet/spec/unit/indirector/catalog/puppetdb_spec.rb
-- puppet/spec/unit/indirector/facts/puppetdb_apply_spec.rb
-- puppet/spec/unit/indirector/facts/puppetdb_spec.rb
-- puppet/spec/unit/indirector/node/puppetdb_spec.rb
-- puppet/spec/unit/indirector/resource/puppetdb_spec.rb
-- puppet/spec/unit/reports/puppetdb_spec.rb
-- puppet/spec/unit/util/puppetdb/char_encoding_spec.rb
-- puppet/spec/unit/util/puppetdb/command_spec.rb
-- puppet/spec/unit/util/puppetdb/config_spec.rb
-- puppet/spec/unit/util/puppetdb/http_spec.rb
-- puppet/spec/unit/util/puppetdb_spec.rb
+- lib/puppet/application/storeconfigs.rb
+- lib/puppet/face/node/deactivate.rb
+- lib/puppet/face/node/status.rb
+- lib/puppet/face/storeconfigs.rb
+- lib/puppet/indirector/catalog/puppetdb.rb
+- lib/puppet/indirector/facts/puppetdb.rb
+- lib/puppet/indirector/facts/puppetdb_apply.rb
+- lib/puppet/indirector/node/puppetdb.rb
+- lib/puppet/indirector/resource/puppetdb.rb
+- lib/puppet/reports/puppetdb.rb
+- lib/puppet/util/puppetdb.rb
+- lib/puppet/util/puppetdb/char_encoding.rb
+- lib/puppet/util/puppetdb/command.rb
+- lib/puppet/util/puppetdb/command_names.rb
+- lib/puppet/util/puppetdb/config.rb
+- lib/puppet/util/puppetdb/http.rb
 homepage: https://github.com/marklawler/ml-puppetdb-terminus
 licenses:
 - Apache-2.0

data/puppet/spec/README.markdown

@@ -1,8 +0,0 @@
-NOTE
-====
-
-This project's specs depend on puppet core, and thus they require the
-puppetlabs_spec_helper project.  For more information please see the
-README in that project, which can be found here:
-
-https://github.com/puppetlabs/puppetlabs_spec_helper

data/puppet/spec/spec.opts

@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace

data/puppet/spec/spec_helper.rb

@@ -1,38 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, "../lib")
-# Maybe puppetlabs_spec_helper is in a directory next to puppetdb. If not, we
-# don't fail any worse than we already would.
-$LOAD_PATH.push File.join(dir, "../../../puppetlabs_spec_helper")
-
-require 'rspec'
-require 'rspec/expectations'
-require 'puppetlabs_spec_helper/puppet_spec_helper'
-require 'tmpdir'
-require 'fileutils'
-require 'puppet'
-require 'puppet/util/puppetdb'
-require 'puppet/util/log'
-
-def create_environmentdir(environment)
-  if not Puppet::Util::Puppetdb.puppet3compat?
-    envdir = File.join(Puppet[:environmentpath], environment)
-    if not Dir.exists?(envdir)
-      Dir.mkdir(envdir)
-    end
-  end
-end
-
-RSpec.configure do |config|
-
-  config.before :each do
-    @logs = []
-    Puppet::Util::Log.level = :info
-    Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs))
-
-    def test_logs
-      @logs.map(&:message)
-    end
-
-  end
-
-end

data/puppet/spec/unit/face/node/deactivate_spec.rb

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-require 'puppet/face'
-require 'puppet/indirector/node/puppetdb'
-
-describe "node face: deactivate" do
-  let(:subject) { Puppet::Face[:node, :current] }
-
-  it "should fail if no node is given" do
-    expect { subject.deactivate }.to raise_error ArgumentError, /provide at least one node/
-  end
-
-  it "should deactivate each node using the puppetdb terminus" do
-    nodes = ['a', 'b', 'c']
-    nodes.each do |node|
-      Puppet::Node::Puppetdb.any_instance.expects(:destroy).with do |request|
-        request.key == node
-      end.returns('uuid' => "uuid_#{node}")
-    end
-
-    subject.deactivate(*nodes).should == {
-      'a' => 'uuid_a',
-      'b' => 'uuid_b',
-      'c' => 'uuid_c',
-    }
-  end
-end

data/puppet/spec/unit/face/node/status_spec.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-require 'puppet'
-require 'puppet/face'
-require 'puppet/network/http_pool'
-
-describe "node face: status" do
-  let(:subject) { Puppet::Face[:node, :current] }
-  let(:headers) do
-    {
-      "Accept" => "application/json",
-      "Content-Type" => "application/x-www-form-urlencoded; charset=UTF-8",
-    }
-  end
-
-  it "should fail if no node is given" do
-    expect { subject.status }.to raise_error ArgumentError, /provide at least one node/
-  end
-
-  it "should fetch the status of each node" do
-    http = stub 'http'
-    Puppet::Network::HttpPool.stubs(:http_instance).returns(http)
-
-    nodes = %w[a b c d e]
-    nodes.each do |node|
-      http.expects(:get).with("/pdb/query/v4/nodes/#{node}", headers)
-    end
-
-    subject.status(*nodes)
-  end
-
-  it "should CGI escape the node names" do
-    http = stub 'http'
-    Puppet::Network::HttpPool.stubs(:http_instance).returns(http)
-
-    node = "foo/+*&bar"
-
-    http.expects(:get).with("/pdb/query/v4/nodes/foo%2F%2B%2A%26bar", headers)
-
-    subject.status(node)
-  end
-end

data/puppet/spec/unit/face/storeconfigs_spec.rb

@@ -1,199 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'puppet/util/puppetdb'
-
-if Puppet::Util::Puppetdb.puppet3compat?
-  require 'spec_helper'
-  require 'puppet/face/storeconfigs'
-  require 'json'
-  require 'puppet/util/feature'
-  require 'puppet/util/puppetdb'
-
-  describe Puppet::Face[:storeconfigs, '0.0.1'], :if => (Puppet.features.rails? && Puppet.features.sqlite?) do
-    def setup_scratch_database
-      Puppet::Rails.stubs(:database_arguments).returns(
-        :adapter => 'sqlite3',
-        :log_level => Puppet[:rails_loglevel],
-        :database => ':memory:'
-      )
-      Puppet[:railslog]     = '/dev/null'
-      Puppet::Rails.init
-    end
-
-    before :all do
-      # We have to have this block to require this file, so they get loaded on
-      # platforms where we are going to run the tests, but not on Ruby 1.8.5.
-      # Unfortunately, rspec will evaluate the describe block (but not the before
-      # block or tests) even if the conditions fail. The lack of a sqlite3 gem
-      # for Ruby 1.8.5 ensures that the condition will always be false on Ruby
-      # 1.8.5, so at this point it's safe to require this.
-      require 'puppet/indirector/catalog/active_record'
-    end
-
-    before :each do
-      setup_scratch_database
-      Puppet[:storeconfigs] = true
-      Puppet[:storeconfigs_backend] = :active_record
-    end
-
-    describe "export action" do
-      after :each do
-        FileUtils.rm_rf(@path)
-      end
-
-      before :each do
-        tempfile = Tempfile.new('export')
-        @path = tempfile.path
-        tempfile.close!
-
-        Dir.mkdir(@path)
-
-        subject.stubs(:destination_file).returns File.join(@path, 'storeconfigs-test.tar')
-      end
-
-      # Turn the filename of a gzipped tar into a hash from filename to content.
-      def tgz_to_hash(filename)
-        # List the files in the archive, ignoring directories (whose names end
-        # with /), and stripping the leading puppetdb-bak.
-        files = `tar tf #{filename}`.lines.map(&:chomp).reject { |fname| fname[-1,1] == '/'}.map {|fname| fname.sub('puppetdb-bak/', '') }
-
-        # Get the content of the files, one per line. Thank goodness they're a
-        # single line each.
-        content = `tar xf #{filename} -O`.lines.to_a
-
-        # Build a hash from filename to content. Ruby 1.8.5 doesn't like
-        # Hash[array_of_pairs], so we have to jump through hoops by flattening
-        # and splatting this list.
-        Hash[*files.zip(content).flatten]
-      end
-
-      describe "with nodes present" do
-        def notify(title, exported=false)
-          Puppet::Resource.new(:notify, title, :parameters => {:message => title}, :exported => exported)
-        end
-
-        def user(name)
-          Puppet::Resource.new(:user, name,
-                               :parameters => {:groups => ['foo', 'bar', 'baz'],
-                                               :profiles => ['stuff', 'here'] #<-- Uses an ordered list
-                                              }, :exported => true)
-        end
-
-        def save_catalog(catalog)
-          request = Puppet::Resource::Catalog.indirection.request(:save, catalog.name, catalog)
-          Puppet::Resource::Catalog::ActiveRecord.new.save(request)
-        end
-
-        before :each do
-          catalog = Puppet::Resource::Catalog.new('foo')
-
-          catalog.add_resource notify('not exported')
-          catalog.add_resource notify('exported', true)
-          catalog.add_resource user('someuser')
-          save_catalog(catalog)
-        end
-
-        it "should have the right structure" do
-          filename = subject.export
-
-          results = tgz_to_hash(filename)
-
-          results.keys.should =~ ['export-metadata.json', 'catalogs/foo.json']
-
-          metadata = JSON.load(results['export-metadata.json'])
-
-          metadata.keys.should =~ ['timestamp', 'command_versions']
-          metadata['command_versions'].should == {'replace_catalog' => 6}
-
-          catalog = JSON.load(results['catalogs/foo.json'])
-
-          catalog.keys.should =~ ['metadata', 'environment', 'certname', 'version', 'edges', 'resources', 'timestamp', 'producer_timestamp']
-
-          catalog['metadata'].should == {'api_version' => 1}
-
-          catalog['certname'].should == 'foo'
-          catalog['edges'].to_set.should == [{
-                                            'source' => {'type' => 'Stage', 'title' => 'main'},
-                                            'target' => {'type' => 'Notify', 'title' => 'exported'},
-                                            'relationship' => 'contains'},
-                                          {"source"=>{"type"=>"Stage", "title"=>"main"},
-                                           "target"=>{"type"=>"User", "title"=>"someuser"},
-                                           "relationship"=>"contains"}].to_set
-
-          catalog['resources'].should include({
-                                             'type'       => 'Stage',
-                                             'title'      => 'main',
-                                             'exported'   => false,
-                                             'tags'       => ['stage', 'main'],
-                                             'parameters' => {},
-                                           })
-
-          catalog['resources'].should include({
-                                             'type'       => 'Notify',
-                                             'title'      => 'exported',
-                                             'exported'   => true,
-                                             'tags'       => ['exported', 'notify'],
-                                             'parameters' => {
-                                               'message' => 'exported',
-                                             },
-                                           })
-
-          catalog['resources'].should include({
-                                             'type'       => 'User',
-                                             'title'      => 'someuser',
-                                             'exported'   => true,
-                                             'tags'       => ['someuser', 'user'],
-                                             'parameters' => {
-                                               'groups'   => ['foo', 'bar', 'baz'],
-                                               'profiles' => ['stuff', 'here']
-                                             },
-                                           })
-        end
-
-        it "should only include exported resources and Stage[main]" do
-          filename = subject.export
-
-          results = tgz_to_hash(filename)
-
-          results.keys.should =~ ['export-metadata.json', 'catalogs/foo.json']
-
-          catalog = JSON.load(results['catalogs/foo.json'])
-
-          catalog['certname'].should == 'foo'
-
-          catalog['edges'].map do |edge|
-            [edge['source']['type'], edge['source']['title'], edge['relationship'], edge['target']['type'], edge['target']['title']]
-          end.to_set.should == [['Stage', 'main', 'contains', 'Notify', 'exported'],
-                                ['Stage', 'main', 'contains', 'User', 'someuser']].to_set
-
-          catalog['resources'].map { |resource| [resource['type'], resource['title']] }.to_set.should == [['Notify', 'exported'], ["User", "someuser"], ['Stage', 'main']].to_set
-
-          notify = catalog['resources'].find {|resource| resource['type'] == 'Notify'}
-
-          notify['exported'].should == true
-        end
-
-        it "should exclude nodes with no exported resources" do
-          catalog = Puppet::Resource::Catalog.new('bar')
-
-          catalog.add_resource notify('also not exported')
-
-          save_catalog(catalog)
-
-          filename = subject.export
-
-          results = tgz_to_hash(filename)
-
-          results.keys.should =~ ['export-metadata.json', 'catalogs/foo.json']
-        end
-      end
-
-      it "should do nothing if there are no nodes" do
-        filename = subject.export
-
-        results = tgz_to_hash(filename)
-        results.keys.should == ['export-metadata.json']
-      end
-    end
-  end
-end