quixoten-puppetdb-terminus 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8ac64ec0646cb863eb8ff02d7d836fa72ae388
-  data.tar.gz: 391e0dca5929e6f08884327cd6da5fee22dc9e33
+  metadata.gz: c7e99f5f9a86df48b79fc6897da9182c87472467
+  data.tar.gz: 7113fda1ad952aedf5697b70ccd9450190bed097
 SHA512:
-  metadata.gz: 78020e2b1c69634080fbae981f83f0ded959d66c63415ef73808d6325c45ae0ddca7d40af0e1f0e1b3bf9bb9dd3e9e915d7817466c7947bb988d934ad8621895
-  data.tar.gz: b72efd6f4dbe6ee0a1b289062cdc6f6ebc0eb965762d48666263897fb8c3884f2f7865daef4f1121e1fe34f21339aa5f80446021defc84d75c97ec8295826b8c
+  metadata.gz: d7cad8a406fec6f2ac4d8d9359d820c0714b8e9154fe7f7d443b32ef502f269a4b15f5302436a08b5c8e94fcd82b36e04d38bb33a887ceb44cc5e0e6dcaf4742
+  data.tar.gz: 2024807daa7da4efd3f37de5211b989afd8c1867e9d60f66e42785cbf63ee63153d0c1212f25c05ee8251c9e0ae9d44c0d7a959df2d3921d7ce54c638f64a2f0

data/lib/puppet/face/node/deactivate.rb

@@ -16,7 +16,6 @@ Puppet::Face.define(:node, '0.0.1') do
     DESC
 
     when_invoked do |*args|
-      Puppet::Util::Puppetdb::GlobalCheck.run
 
       opts = args.pop
       raise ArgumentError, "Please provide at least one node for deactivation" if args.empty?

data/lib/puppet/face/node/status.rb

@@ -14,8 +14,6 @@ Puppet::Face.define(:node, '0.0.1') do
       require 'puppet/util/puppetdb'
       require 'json'
 
-      Puppet::Util::Puppetdb::GlobalCheck.run
-
       opts = args.pop
       raise ArgumentError, "Please provide at least one node" if args.empty?
 

data/lib/puppet/face/storeconfigs.rb

@@ -22,8 +22,6 @@ Puppet::Face.define(:storeconfigs, '0.0.1') do
     DESC
 
     when_invoked do |options|
-      require 'puppet/util/puppetdb/global_check'
-      Puppet::Util::Puppetdb::GlobalCheck.run
 
       require 'puppet/rails'
 

data/lib/puppet/indirector/catalog/puppetdb.rb

@@ -7,11 +7,6 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
   include Puppet::Util::Puppetdb::CommandNames
 
-  # Run initial checks
-  def initialize
-    Puppet::Util::Puppetdb::GlobalCheck.run
-  end
-
   def save(request)
     profile "catalog#save" do
       catalog = munge_catalog(request.instance, extract_extra_request_data(request))

data/lib/puppet/indirector/facts/puppetdb.rb

@@ -9,11 +9,6 @@ class Puppet::Node::Facts::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
   include Puppet::Util::Puppetdb::CommandNames
 
-  # Run initial checks
-  def initialize
-    Puppet::Util::Puppetdb::GlobalCheck.run
-  end
-
   def get_trusted_info(node)
     trusted = Puppet.lookup(:trusted_information) do
       Puppet::Context::TrustedInformation.local(request.node)

data/lib/puppet/indirector/node/puppetdb.rb

@@ -5,11 +5,6 @@ require 'puppet/util/puppetdb'
 class Puppet::Node::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
 
-  # Run initial checks
-  def initialize
-    Puppet::Util::Puppetdb::GlobalCheck.run
-  end
-
   def find(request)
   end
 

data/lib/puppet/indirector/resource/puppetdb.rb

@@ -6,11 +6,6 @@ require 'uri'
 class Puppet::Resource::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
 
-  # Run initial checks
-  def initialize
-    Puppet::Util::Puppetdb::GlobalCheck.run
-  end
-
   def search(request)
     profile "resource#search" do
       type   = request.key

data/lib/puppet/reports/puppetdb.rb

@@ -5,8 +5,6 @@ require 'puppet/util/puppetdb/command_names'
 Puppet::Reports.register_report(:puppetdb) do
   include Puppet::Util::Puppetdb
 
-  Puppet::Util::Puppetdb::GlobalCheck.run
-
   CommandStoreReport = Puppet::Util::Puppetdb::CommandNames::CommandStoreReport
 
   desc <<-DESC
@@ -126,6 +124,7 @@ Puppet::Reports.register_report(:puppetdb) do
       "message"           => nil,
       "file"              => resource_status.file,
       "line"              => resource_status.line,
+      "containment-path" => resource_status.containment_path,
     }
   end
 

data/lib/puppet/util/puppetdb.rb

@@ -1,7 +1,6 @@
 require 'puppet/util'
 require 'puppet/util/logging'
 require 'puppet/util/profiler'
-require 'puppet/util/puppetdb/global_check'
 require 'puppet/util/puppetdb/command_names'
 require 'puppet/util/puppetdb/command'
 require 'puppet/util/puppetdb/config'

data/lib/puppetdb/terminus/version.rb

@@ -1,6 +1,6 @@
 module PuppetDB
   module Terminus
-    VERSION          = "2.2.0"
+    VERSION          = "2.2.1"
     UPSTREAM_VERSION = VERSION.split(".")[0..2].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quixoten-puppetdb-terminus
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Devin Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,6 @@ files:
 - lib/puppet/util/puppetdb/command.rb
 - lib/puppet/util/puppetdb/command_names.rb
 - lib/puppet/util/puppetdb/config.rb
-- lib/puppet/util/puppetdb/global_check.rb
 - lib/puppetdb-terminus.rb
 - lib/puppetdb/terminus.rb
 - lib/puppetdb/terminus/version.rb

data/lib/puppet/util/puppetdb/global_check.rb

@@ -1,31 +0,0 @@
-require 'semver'
-require 'puppet/version'
-require 'puppet/error'
-
-module Puppet::Util::Puppetdb
-  # Global checks for version support and other validations before the terminus
-  # is used.
-  #
-  class GlobalCheck
-    # Validate that the support for the version of Puppet we are running on is
-    # still maintained.
-    #
-    # @param minimum [String] minimum version for operation
-    # @throws [Puppet::Error] raised if current version is unsupported
-    # @api private
-    def self.puppet_version_check(minimum)
-      minimum_version = ::SemVer.new(minimum)
-      puppet_version = ::SemVer.new(Puppet.version)
-      if (puppet_version <=> minimum_version) == -1 then
-        raise Puppet::Error, "You are attempting to use puppetdb-terminus on an unsupported version of Puppet (#{puppet_version}) the minimum supported version is #{minimum_version}"
-      end
-    end
-
-    # Run all checks
-    #
-    # @throws [Puppet::Error] raised for any validation errors
-    def self.run
-      self.puppet_version_check("3.5.1")
-    end
-  end
-end