octofacts-updater 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05efcd40e8410c43eb2fd197165de57b754d0e28
-  data.tar.gz: ad65e6ce8d288593e0b2b03075fcda6f52fbd4cb
+  metadata.gz: b4b50c8a2fec8f9a4246634633180bf12276c66e
+  data.tar.gz: 41484ac0bc84813a554ff68c7e92ebee525756e3
 SHA512:
-  metadata.gz: 507c0eecd6dd8c7c281e6734f1dbdde0731ee2e8cfcedd2bc5f9d7fc68fc7805207d5032d3ffc1d20df0e75154afb3786e0ff6f93d03af9e271592d9d45996ec
-  data.tar.gz: e017a38aa6681a768d06cc085f4dc4480e4ef736d6782fd6f05a9d2b24b391bc5911b9e0d47791f080ea3321c96b3117f44cd864e60ba2108f95c22c675e60f7
+  metadata.gz: cbd45aa3e9cb4d6e7e79e25dc85339887c3a6044d958ddc4e20fb8664310909c2be3d37e6a8315e15b80076779747d1f66a840d34178b23347839a2ee76ef345
+  data.tar.gz: f74a33d55190ff784ced6238717266ed6ff94c07a8f4e4bfa09e5c159f389b95ec56a2c28b4e6040c84eddb25c2914c4d0a99e893dcd330d4455b6df840ad704

data/.version

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/octofacts_updater/cli.rb

@@ -16,8 +16,8 @@ module OctofactsUpdater
         end
 
         opts.on("-c", "--config <config_file>", String, "Path to configuration file") do |f|
-          raise "Invalid configuration file" unless File.file?(f)
-          @opts[:config] = f
+          @opts[:config] = File.expand_path(f)
+          raise "Invalid configuration file #{@opts[:config].inspect}" unless File.file?(@opts[:config])
         end
 
         opts.on("-H", "--hostname <hostname>", String, "FQDN of the host whose facts are to be gathered") do |h|
@@ -67,11 +67,12 @@ module OctofactsUpdater
     end
 
     def usage
-      puts "Usage: octofacts-updater --action <action> [--config-file /path/to/config.yaml] [other options]"
+      puts "Usage: octofacts-updater --action <action> [--config /path/to/config.yaml] [other options]"
       puts ""
       puts "Available actions:"
-      puts "  bulk:  Update fixtures and index in bulk"
-      puts "  facts: Obtain facts for one node (requires --hostname <hostname>)"
+      puts "  bulk:    Update fixtures and index in bulk"
+      puts "  facts:   Obtain facts for one node (requires --hostname <hostname>)"
+      puts "  reindex: Build a new index from the existing fact fixtures"
       puts ""
     end
 
@@ -106,6 +107,7 @@ module OctofactsUpdater
 
       return handle_action_bulk if opts[:action] == "bulk"
       return handle_action_facts if opts[:action] == "facts"
+      return handle_action_bulk if opts[:action] == "reindex"
 
       usage
       exit 255
@@ -126,19 +128,39 @@ module OctofactsUpdater
       end
     end
 
-    def handle_action_bulk
-      facts_to_index = @config.fetch("index", {})["indexed_facts"]
-      unless facts_to_index.is_a?(Array)
-        raise ArgumentError, "Must declare index:indexed_facts in configuration to use bulk update"
-      end
+    def nodes_for_bulk
+      if opts[:action] == "reindex"
+        @opts[:quick] = true
+
+        path = if opts[:path]
+          File.expand_path(opts[:path])
+        elsif @config.fetch("index", {})["node_path"]
+          File.expand_path(@config.fetch("index", {})["node_path"], File.dirname(opts[:config]))
+        else
+          raise ArgumentError, "Must set --path, or define index:node_path to a valid directory in configuration"
+        end
+
+        unless File.directory?(path)
+          raise Errno::ENOENT, "--path must be a directory (#{path.inspect} is not)"
+        end
 
-      nodes = if opts[:host_list]
+        Dir.glob("#{path}/*.yaml").map { |f| File.basename(f, ".yaml") }
+      elsif opts[:host_list]
         opts[:host_list]
       elsif opts[:hostname]
         [opts[:hostname]]
       else
         OctofactsUpdater::FactIndex.load_file(index_file).nodes(true)
       end
+    end
+
+    def handle_action_bulk
+      facts_to_index = @config.fetch("index", {})["indexed_facts"]
+      unless facts_to_index.is_a?(Array)
+        raise ArgumentError, "Must declare index:indexed_facts in configuration to use bulk update"
+      end
+
+      nodes = nodes_for_bulk
       if nodes.empty?
         raise ArgumentError, "Cannot run bulk update with no nodes to check"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octofacts-updater
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy