onceover-lookup 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 338db64a91beffef6d50d429661d801d1f9f0faa576c5237ebf393e25a9698c2
-  data.tar.gz: ec7bdfbbc369929e9866769cf9bee4fc167b4db6255f0348bc49dc6faeece441
+  metadata.gz: 23e3381ff67b431966f5eda0d964fffc58ce890c41a837cf129f664bea571544
+  data.tar.gz: 1ebe6755ee36b60d59c14ee8f23ea7d196b9afe1386b3467b694994c527500ab
 SHA512:
-  metadata.gz: 2223de384ef4df55d59bd130b9f208b3329b8b449c5f7f43324460429243a75de015af131e1b0588edf3d5fc3947432c745a11d3b656f12a0d75581fbc286873
-  data.tar.gz: '08d7163321d03f761ffee1651d7b6ced916bab05aefadd0fdcab8cba92e205a6a169c1d11780a36fb8a23bd811ed2d637a9c8ae3b2f9336f0fb07eaa6eb97cdf'
+  metadata.gz: 644d575c15a0b764a80b37ab78c91254232cfa62190400d7c1726b51ad8849c6f2af732eac38932b1bd864325d18ca4af49e363cce4b5dec125fc17eb7f086c0
+  data.tar.gz: 9e1f2f741915e2ff7e97a4a9c53104615277f15f996c6e3d052bab3bb7a1e2a89c2049912b54cfe54c4cdf79b7e8b13ce0ca995f9703049f1b3035eaefd415f7

data/lib/onceover/lookup/cli.rb

@@ -9,7 +9,7 @@ class Onceover
         @cmd ||= Cri::Command.define do
           name 'lookup'
           usage 'lookup [--name NAME]'
-          summary "Hello, World! plugin for Onceover"
+          summary "Do a hiera lookup"
           description <<-DESCRIPTION
 Run the `puppet lookup` command to use onceover configuration
           DESCRIPTION

data/lib/onceover/lookup/lookup.rb

@@ -5,8 +5,9 @@ require "json"
 class Onceover
   module Lookup
     module Lookup
-      PUPPET_CONF    = ".puppet.conf.onceover"
-      LOOKUP_TMP_DIR = ".onceover/tmp"
+      PUPPET_CONF       = ".puppet.conf.onceover"
+      LOOKUP_TMP_DIR    = ".onceover/tmp"
+      ENVIRONMENT_CONF  = ".onceover/etc/puppetlabs/code/environments/production/environment.conf"
 
       # Figure out what hiera.yaml we should be using. If there isn't a custom
       # one, then fallback to the per-environment one. We don't care if this
@@ -46,53 +47,85 @@ class Onceover
         end
       end
 
-      def self.run(passthru, factset)
-        if factset
-          if factset.include? "/"
-            # relative path - use this
-            input_factset = factset
-          else
-            # resolve factset from Onceover's built-in facts
-            # https://stackoverflow.com/a/10083594/3441106
-            spec = Gem::Specification.find_by_name("onceover")
-            gem_root = spec.gem_dir
-
-            input_factset = File.join(gem_root, "factsets", "#{factset}.json")
-          end
+      def self.fix_environment_conf
+        environment_conf = File.readlines(ENVIRONMENT_CONF)
+        environment_conf_clean = environment_conf.reject { |e| e =~ /^config_version/ }
 
-          logger.info "Extracting factset #{factset}..."
-          begin
-            data_hash = JSON.parse(File.read(input_factset))
-
-            # must give file extension or puppet will:
-            # Error: Could not parse application options: undefined method `[]' for nil:NilClass
-            factset_tempfile = Tempfile.new(["facts", ".json"])
-            factset_tempfile.write(data_hash["values"].to_json)
-            factset_tempfile.close
-          rescue Errno::ENOENT => e
-            raise("File not found reading: #{input_factset}: #{e.message}")
+        if environment_conf != environment_conf_clean
+          File.open(ENVIRONMENT_CONF, "w") do |f|
+            f.puts(environment_conf_clean)
           end
-        else
-          input_factset = nil
         end
+      end
 
-        cmd = "bundle exec puppet lookup --config #{PUPPET_CONF} #{passthru}"
-        if input_factset
-          if passthru =~ /--facts/
-            raise "You cannot specify both `--facts` and `--factsets`"
-          end
-          cmd += " --facts #{factset_tempfile.path}"
+      def self.check_setup
+        status = true
+        if ! File.exist? PUPPET_CONF
+          logger.error "#{PUPPET_CONF} does not exist, please run `onceover run lookup setup` to create it"
+          status = false
         end
 
-        if ! Dir.exist? LOOKUP_TMP_DIR
-          logger.info "creating #{LOOKUP_TMP_DIR}"
-          FileUtils.mkdir_p LOOKUP_TMP_DIR
+        if ! File.exist? ENVIRONMENT_CONF
+          logger.error "#{ENVIRONMENT_CONF} does not exist, please run `onceover run spec ...` to create it"
+          status = false
         end
 
-        logger.info "running command: #{cmd}"
-        system(cmd)
+        status
       end
 
+      def self.run(passthru, factset)
+        if check_setup
+          if factset
+            if factset.include? "/"
+              # relative path - use this
+              input_factset = factset
+            else
+              # resolve factset from Onceover's built-in facts
+              # https://stackoverflow.com/a/10083594/3441106
+              spec = Gem::Specification.find_by_name("onceover")
+              gem_root = spec.gem_dir
+
+              input_factset = File.join(gem_root, "factsets", "#{factset}.json")
+            end
+
+            logger.info "Extracting factset #{factset}..."
+            begin
+              data_hash = JSON.parse(File.read(input_factset))
+
+              # must give file extension or puppet will:
+              # Error: Could not parse application options: undefined method `[]' for nil:NilClass
+              factset_tempfile = Tempfile.new(["facts", ".json"])
+              factset_tempfile.write(data_hash["values"].to_json)
+              factset_tempfile.close
+            rescue Errno::ENOENT => e
+              raise("File not found reading: #{input_factset}: #{e.message}")
+            end
+          else
+            input_factset = nil
+          end
+
+          # Fix environment.conf on windows by removing any `config_version`
+          # since the script cant run on windows it errors the whole run. Do this
+          # on all platforms since it does nothing useful on Linux either
+          fix_environment_conf
+
+          cmd = "bundle exec puppet lookup --config #{PUPPET_CONF} #{passthru}"
+          if input_factset
+            if passthru =~ /--facts/
+              raise "You cannot specify both `--facts` and `--factsets`"
+            end
+            cmd += " --facts #{factset_tempfile.path}"
+          end
+
+          if ! Dir.exist? LOOKUP_TMP_DIR
+            logger.info "creating #{LOOKUP_TMP_DIR}"
+            FileUtils.mkdir_p LOOKUP_TMP_DIR
+          end
+
+          logger.info "running command: #{cmd}"
+          system(cmd)
+        end
+      end
     end
   end
 end

data/lib/onceover/lookup/version.rb

@@ -1,5 +1,5 @@
 class Onceover
   module Lookup
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover-lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Declarative Systems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler