seiso-import_chef 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzI4MGI0MTMwMDM2YWZhODg5OTEwNTk3YzE3Zjg3NDI1MzI2ODQ5Mw==
+    YmM4ODJmMmJhZGY5MjRkMjU1YWE1YTE5ZTJjODRjM2MzZWU3ZWRiZQ==
   data.tar.gz: !binary |-
-    ZGM1MjhiYjUzN2FlOTY5MDY4NjQyMWY4NDIwZDdiMDg0NTE1NTFkOA==
+    MDIxYWU0Y2Y4NTJlMWNiYTU2ZTZkYTZkM2JhNDhkMDU3NTgxYTVjOQ==
 SHA512:
   metadata.gz: !binary |-
-    NmQ3MmI5NmUyMjIxMmExOWMyZjRjODc2ZjE2ZmU3NjA1OWNiMWQ1YzEwM2U2
-    ZjJjOWNkYjBjMTlmZWMxOWNhMDg1YjQxYTFhZWM3M2U3MzVkNmRlMWEyYmNh
-    ZTY2NzdhODllMjM5ZDQ1ZDNlYzkwYzdlNGRkNDM0ZDI2OTJlYmM=
+    YzA4MmE5NmVkY2RmMGQyYzU1NmZjNGUxMDI1OGM5YzliNjk3YTA0ZDZiZDU2
+    ZjFkMzMyMzJjNTY4ZjdlYzU0NTI3NTNiNTRiYmY5YmMzNTY0ODdhMDJmNTk3
+    ZWFlMDg2ZDRkZDJmYmExZWQ1NGJjOTk5NzJjMDc0MjJiYmFiOWI=
   data.tar.gz: !binary |-
-    MjkyODdjNWQ5YTNjNGI5ODBiNmY4YjJmYWJlYWM0ZmE3OTFlZjYwZDA4MmM4
-    NWFkMjZjZDZjNzViNmZhOWE3ZTc3ZTgxMDc2MDE1MDAxNjVkOWYyMTkxYjhl
-    ZjM2NjE4Njg2ZTQ2NDY4ZWRkYWRmMWNiODc5MDcyN2Y4YjBjYWY=
+    YmRkNzhlYzZkYTk1NTZjOWQ5YWIwZGQ1OGVkMzM2YTE4YmUyYTBkZTk5ZDYz
+    YTRiNjFhZjU2ZmQyMjE4OTdiYjJiZDE1MzhlZWUxM2I3OGFkNWM3NTU1MDJh
+    MjA0OGRjYTI4NzczMjI2MDZjOGFjMDY2ZDY4MWNmNzc4MTZjMDk=

data/README.md

@@ -1,9 +1,10 @@
 # Seiso::ImportChef
 
+[![Gem Version](https://badge.fury.io/rb/seiso-import_chef.svg)](http://badge.fury.io/rb/seiso-import_chef)
 [![Build Status](https://travis-ci.org/ExpediaDotCom/seiso-import_chef.svg)](https://travis-ci.org/ExpediaDotCom/seiso-import_chef)
 [![Inline docs](http://inch-ci.org/github/ExpediaDotCom/seiso-import_chef.svg?branch=master)](http://inch-ci.org/github/ExpediaDotCom/seiso-import_chef)
 
-Imports Chef data into Seiso.
+Imports Chef data into Seiso. See [Integrate Chef Server Data Using Seiso](http://seiso.io/guides/integrate-chef-server-data-using-seiso/) for more details.
 
 ## Installation
 
@@ -33,4 +34,4 @@ Or install it yourself as:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create a new pull request.

data/bin/seiso-import-chef

@@ -2,16 +2,45 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+require 'optparse'
 require 'seiso/import_chef'
 require 'yaml'
 
 # Imports Chef Server nodes into Seiso as machines.
 #
-# Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+# Author:: Willie Wheeler
 # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
 # License:: Apache 2.0
 
-chef_settings = YAML.load_file "#{Dir.home}/.seiso-importers/chef.yml"
-seiso_settings = YAML.load_file "#{Dir.home}/.seiso-importers/seiso.yml"
+options = {}
+option_parser = OptionParser.new do |opts|
+  executable_name = File.basename $PROGRAM_NAME
+  opts.banner = "Import Chef server nodes into Seiso as machines.
+
+Usage: #{executable_name} [options]"
+  options[:chef_settings_path] = "#{Dir.home}/.seiso-importers/chef.yml"
+  opts.on("--chef CHEF_SETTINGS_PATH", "Path to Chef server settings file") do |path|
+    options[:chef_settings_path] = path
+  end
+  
+  options[:seiso_settings_path] = "#{Dir.home}/.seiso-importers/seiso.yml"
+  opts.on("--seiso SEISO_SETTINGS_PATH", "Path to Seiso API settings file") do |path|
+    options[:seiso_settings_path] = path
+  end
+
+  opts.on("-h", "--help", "Display this screen") do
+    puts opts
+    exit
+  end
+end
+
+option_parser.parse!
+
+puts ("Using: #{options[:chef_settings_path]}")
+puts ("Using: #{options[:seiso_settings_path]}")
+
+chef_settings = YAML.load_file(options[:chef_settings_path])
+seiso_settings = YAML.load_file(options[:seiso_settings_path])
+
 importer = Seiso::ImportChef.new(chef_settings, seiso_settings)
-importer.import_all
+#importer.import_all

data/lib/seiso/import_chef.rb

@@ -11,7 +11,6 @@ module Seiso
   # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
   # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
   # License:: Apache 2.0
-  
   class ImportChef
     
     # Batch size for putting nodes into Seiso.
@@ -23,7 +22,7 @@ module Seiso
         "#{chef_settings['client_name']}",
         "#{chef_settings['signing_key']}")
       @seiso = Seiso::Connector.new seiso_settings
-      @mapper = Seiso::ChefMachineMapper.new
+      @mapper = Seiso::ImportChef::ChefMachineMapper.new
     end
 
     # Imports all nodes from the Chef server into Seiso.

data/lib/seiso/import_chef/chef_machine_mapper.rb

@@ -1,53 +1,53 @@
-# Seiso namespace module
 module Seiso
-  
-  # Maps Chef nodes to Seiso machines.
-  # 
-  # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-  # Copyright:: Copyright (c) 2014-2015
-  # License:: Apache 2.0
-  
-  class ChefMachineMapper
+  class ImportChef
     
-    # Maps a list of Chef nodes to a list of Seiso machines.
-    def map_all(chef_nodes)
-      return nil if chef_nodes.nil?
-      seiso_machines = []
-      chef_nodes.each do |n|
-        seiso_machines << map_one(n)
-      end
-      seiso_machines
-    end
-    
-    def map_one(chef_node)
-      return nil if chef_node.nil?
-      {
-        # FIXME Not sure which field Chef uses as the key here, so we'll just set that externally for now.
-        #      "name" => cleanup(chef_node["name"]),
-        "fqdn" => cleanup(chef_node["fqdn"]),
-        "hostname" => cleanup(chef_node["hostname"]),
-        "domain" => cleanup(chef_node["domain"]),
-        
-        # TODO For the nodes so far, this is a single IP address. Not sure whether Chef supports multiple IPv4 addresses,
-        # or what it returns in that case. Need to look into it.
-        "ipAddress" => cleanup(chef_node["ipaddress"]),
-        
-        # FIXME Commenting this out for now, as it generates arrays where Seiso expects a single value. Not sure why
-        # Chef uses a single value for IPv4 but an array for IPv6.
-        #      "ip6Address" => cleanup(chef_node["ip6address"]),
-        
-        "macAddress" => cleanup(chef_node["macaddress"]),
-        "platform" => cleanup(chef_node["platform"]),
-        "platformVersion" => cleanup(chef_node["platform_version"]),
-        "os" => cleanup(chef_node["os"]),
-        "osVersion" => cleanup(chef_node["os_version"])
-      }
-    end
+    # Maps Chef nodes to Seiso machines.
+    # 
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015
+    # License:: Apache 2.0
+    class ChefMachineMapper
     
-    private
-    
-    def cleanup(s)
-      s.nil? ? nil : s.strip.downcase
+      # Maps a list of Chef nodes to a list of Seiso machines.
+      def map_all(chef_nodes)
+        return nil if chef_nodes.nil?
+        seiso_machines = []
+        chef_nodes.each do |n|
+          seiso_machines << map_one(n)
+        end
+        seiso_machines
+      end
+      
+      def map_one(chef_node)
+        return nil if chef_node.nil?
+        {
+          # FIXME Not sure which field Chef uses as the key here, so we'll just set that externally for now.
+          #      "name" => cleanup(chef_node["name"]),
+          "fqdn" => cleanup(chef_node["fqdn"]),
+          "hostname" => cleanup(chef_node["hostname"]),
+          "domain" => cleanup(chef_node["domain"]),
+          
+          # TODO For the nodes so far, this is a single IP address. Not sure whether Chef supports multiple IPv4 addresses,
+          # or what it returns in that case. Need to look into it.
+          "ipAddress" => cleanup(chef_node["ipaddress"]),
+          
+          # FIXME Commenting this out for now, as it generates arrays where Seiso expects a single value. Not sure why
+          # Chef uses a single value for IPv4 but an array for IPv6.
+          #      "ip6Address" => cleanup(chef_node["ip6address"]),
+          
+          "macAddress" => cleanup(chef_node["macaddress"]),
+          "platform" => cleanup(chef_node["platform"]),
+          "platformVersion" => cleanup(chef_node["platform_version"]),
+          "os" => cleanup(chef_node["os"]),
+          "osVersion" => cleanup(chef_node["os_version"])
+        }
+      end
+      
+      private
+      
+      def cleanup(s)
+        s.nil? ? nil : s.strip.downcase
+      end
     end
   end
 end

data/refresh

@@ -0,0 +1,2 @@
+gem build seiso-import_chef.gemspec
+gem install seiso-import_chef-*.gem

data/seiso-import_chef.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "seiso-import_chef"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Imports Chef data into Seiso."

data/test/test_chef_machine_mapper.rb

@@ -8,7 +8,7 @@ require "seiso/import_chef/chef_machine_mapper"
 class TestChefMachineMapper < MiniTest::Unit::TestCase
 
   def setup
-    @mapper = Seiso::ChefMachineMapper.new
+    @mapper = Seiso::ImportChef::ChefMachineMapper.new
     @chef_node = {
       "fqdn" => "my-fqdn",
       "hostname" => "my-hostname",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_chef
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - bin/seiso-import-chef
 - lib/seiso/import_chef.rb
 - lib/seiso/import_chef/chef_machine_mapper.rb
+- refresh
 - sample_conf/chef.yml.sample
 - sample_conf/seiso.yml.sample
 - seiso-import_chef.gemspec