seiso-import_master 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNhOGJjY2IwMzU3ZWU5NzFkZTJmZDZmNGMyODJhOWI1YjliMTQwMA==
+    MWFiZGMwNjdkYjNiZmEzMzk1Mzk3MDcyZTZjNTdlNmU2ZWVkN2VmYw==
   data.tar.gz: !binary |-
-    N2ZiY2ExZGMzYTlhZmJkNWQwOWM2ODIwMDE1OThjMGI0N2UxMWNmNw==
+    OWE5YTljODk0YTk2NTNmMjJjYTY0MzU4MjhiNzk4Y2E4MTI5ZTRlZA==
 SHA512:
   metadata.gz: !binary |-
-    ZmJhNzRmOWI4ZTkxMDRmYzA5YzUzYzk3ZWYwN2FhMGY1ZGYzYTc1ZTk4MTY1
-    YmFiYWIyNTM4NzBjZjIzZDhiOTc2ZDYyOTdjYzIwMWJkYjliODljNzdjOTM5
-    N2IxODAyZTlhN2MzNTlmMjQ4YzEwOWQxYmZiMjg3MjEwZGQxNTQ=
+    NDg4Mjk5YWFkZTI4MjgxMWZhODU0MTc4MTc5Y2U5NGViODg0ZmI4YjY1MDQw
+    Nzk2MzczMGIxOTI4ZjM1MzI4NTcwNmY5ZjdkNGYyOGUyZDJjZjdhYTY3Nzky
+    YzRkNTY3MTRhOWQzMGVmNzg3ZTBjMjg3ZTM4OWY2ZDVmOWE1NmQ=
   data.tar.gz: !binary |-
-    MmMxOTc2MTYzYmY0NjE3NWJlYWYxZThjNDhiOTk1NDFmMDY1NTdmNTIwNWVl
-    ODVjMzMwOTQxNDIyY2JkYjhiZTk0NTZhNDgzY2QxN2UzNmI4ODgzNmVlYjll
-    M2I0OWU2NmI0OTEyMzNjZGI4MDRhZjVhMTI1YWE4NGJiMGI5Njg=
+    NzA0ZmUyMWVkMjQzNzI1Y2FmMTk4YWU0ODUxMWI3YWIxMDYxNmFlZjhlZmY0
+    YjYzYzRjMjQyYzRjZTQ0NDM1ZDBjYjc0NTZlYTE2ZjVhNWI0YWQ1MDgwYWM3
+    ZWZmMzViZmNjNDcxYjY0MTI5ODRjODEyZjVkZWRhMGMxOWU0ZjU=

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/reports/
 /tmp/
 *.bundle
+*.gem
 *.so
 *.o
 *.a

data/bin/seiso-import-master

@@ -8,7 +8,7 @@ require 'yaml'
 
 # Imports Seiso data master files into Seiso.
 #
-# Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+# Author:: Willie Wheeler
 # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
 # License:: Apache 2.0
 
@@ -18,18 +18,34 @@ option_parser = OptionParser.new do |opts|
   opts.banner = "Import one or more Seiso data master files into Seiso.
 
 Usage: #{executable_name} [options] master_file ..."
+  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
+
+  options[:format] = 'json'
   opts.on("-f FORMAT", "--format FORMAT", "Document format, either 'json' (default) or 'yaml'") do |format|
     options[:format] = format
   end
+  
+  opts.on("-h", "--help", "Display this screen") do
+    puts opts
+    exit
+  end
 end
 
-option_parser.parse!
+begin
+  option_parser.parse!
+rescue OptionParser::InvalidOption => e
+  abort "Invalid option.\n\n#{option_parser.help}"
+end
+
+puts "Using: #{options[:seiso_settings_path]}"
+puts "Using: format=#{options[:format]}"
+
 files = ARGV
 abort "Error: You must supply a master file.\n\n#{option_parser.help}" if files.empty?
 
-format = options[:format] || 'json'
-puts "Using #{format} format"
-
-settings = YAML.load_file "#{Dir.home}/.seiso-importers/seiso.yml"
+settings = YAML.load_file(options[:seiso_settings_path])
 importer = Seiso::ImportMaster.new settings
-importer.import_files(files, format)
+importer.import_files(files, options[:format])

data/lib/seiso/import_master.rb

@@ -13,7 +13,6 @@ module Seiso
   # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
   # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
   # License:: Apache 2.0
-  
   class ImportMaster
     
     # Initializes the importer with a Seiso connector.
@@ -21,9 +20,9 @@ module Seiso
       @seiso = Seiso::Connector.new seiso_settings
       
       # TODO Inject dependencies?
-      @uri_factory = Seiso::UriFactory.new @seiso.base_uri
-      @link_factory = Seiso::LinkFactory.new @uri_factory
-      @mapper = Seiso::MasterItemMapper.new @link_factory
+      @uri_factory = Seiso::ImportMaster::UriFactory.new @seiso.base_uri
+      @link_factory = Seiso::ImportMaster::LinkFactory.new @uri_factory
+      @mapper = Seiso::ImportMaster::MasterItemMapper.new @link_factory
       
       @loaders = {
         'json' => ->(file) { JSON.parse(IO.read(file)) },

data/lib/seiso/import_master/link_factory.rb

@@ -1,48 +1,48 @@
-# Seiso namespace module
 module Seiso
-  
-  # Link factory, supporting HATEOAS principle.
-  #
-  # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-  # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-  # License:: Apache 2.0
-  
-  class LinkFactory
-
-    # Creates a new link factory, injecting the URI factory.
-    # - uri_factory: URI factory
-    def initialize(uri_factory)
-      @uri_factory = uri_factory
-    end
+  class ImportMaster
     
-    # Creates a new link. Only for link involving a single key, at least for now.
-    # - type: Item type (e.g., services, service-instances, data-centers, etc.)
-    # - key_name: name of the property the item type uses as a unique key
-    # - key_value: key value
-    def link(type, key_name, key_value)
-      return nil if key_value.nil?
-      
-      {
-        '_self' => @uri_factory.item_uri(type, key_value),
-        
-        # FIXME Deprecated. To replace with _self URI above.
-        key_name => key_value
-      }
-    end
+    # Link factory, supporting HATEOAS principle.
+    #
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class LinkFactory
 
-    # Creates a new IP address role link.
-    # - service_instance_key: Service instance key
-    # - role_name: IP address role name
-    def ip_address_role_link(service_instance_key, role_name)
-      {
-        '_self' => @uri_factory.item_uri('ip-address-roles', service_instance_key, role_name),
+      # Creates a new link factory, injecting the URI factory.
+      # - uri_factory: URI factory
+      def initialize(uri_factory)
+        @uri_factory = uri_factory
+      end
+      
+      # Creates a new link. Only for link involving a single key, at least for now.
+      # - type: Item type (e.g., services, service-instances, data-centers, etc.)
+      # - key_name: name of the property the item type uses as a unique key
+      # - key_value: key value
+      def link(type, key_name, key_value)
+        return nil if key_value.nil?
         
-        # FIXME These are deprecated. To replace with _self URI above.
-        'serviceInstance' => {
-          'key' => service_instance_key
-        },
-        'name' => role_name
-      }
+        {
+          '_self' => @uri_factory.item_uri(type, key_value),
+          
+          # FIXME Deprecated. To replace with _self URI above.
+          key_name => key_value
+        }
+      end
+      
+      # Creates a new IP address role link.
+      # - service_instance_key: Service instance key
+      # - role_name: IP address role name
+      def ip_address_role_link(service_instance_key, role_name)
+        {
+          '_self' => @uri_factory.item_uri('ip-address-roles', service_instance_key, role_name),
+          
+          # FIXME These are deprecated. To replace with _self URI above.
+          'serviceInstance' => {
+            'key' => service_instance_key
+          },
+          'name' => role_name
+        }
+      end
     end
   end
 end

data/lib/seiso/import_master/master_item_mapper.rb

@@ -1,170 +1,169 @@
-# Seiso namespace module
 module Seiso
+  class ImportMaster
 
-  # Maps the data master format to the Seiso API format.
-  #
-  # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-  # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-  # License:: Apache 2.0
-  
-  class MasterItemMapper
+    # Maps the data master format to the Seiso API format.
+    #
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class MasterItemMapper
     
-    def initialize(link_factory)
-      @link_factory = link_factory
-      @mappers = {
-        'data-centers' => data_center_mapper,
-        'environments' => environment_mapper,
-        'health-statuses' => health_status_mapper,
-        'infrastructure-providers' => infrastructure_provider_mapper,
-        'ip-address-roles' => ip_address_role_mapper,
-        'load-balancers' => load_balancer_mapper,
-        'machines' => machine_mapper,
-        'nodes' => node_mapper,
-        'node-ip-addresses' => node_ip_address_mapper,
-        'regions' => region_mapper,
-        'rotation-statuses' => rotation_status_mapper,
-        'services' => service_mapper,
-        'service-groups' => service_group_mapper,
-        'service-instances' => service_instance_mapper,
-        'service-instance-ports' => service_instance_port_mapper,
-        'service-types' => service_type_mapper,
-        'status-types' => status_type_mapper
-      }
-    end
-
-    # Maps a list of items.
-    # - type: Item type
-    # - items: Item list
-    def map_all(type, items)
-      mapper = mapper_for type
-      result = []
-      items.each { |i| result << mapper.call(i) }
-      result
-    end
-
-    # Maps a single item.
-    # - type: Item type
-    # - item: Item
-    def map_one(type, item)
-      mapper_for(type).call item
-    end
-    
-    private
-    
-    # Returns a link for the specified item, or nil if key_value is nil.
-    def link_for(type, key_name, key_value)
-      # Do nil check here (even though link factory does it too) since the unit test requires this behavior.
-      return key_value.nil? ? nil : @link_factory.link(type, key_name, key_value)
-    end
-    
-    # Returns a mapper lambda for the specified type.
-    def mapper_for(type)
-      mapper = @mappers[type]
-      raise ArgumentError, "Unknown type: #{type}" if mapper.nil?
-      mapper
-    end
-
-    # Returns a mapper lambda.
-    def data_center_mapper
-      ->(dc) {
-        {
-          'key' => dc['key'],
-          'name' => dc['name'],
-          'region' => link_for('regions', 'key', dc['region'])
+      def initialize(link_factory)
+        @link_factory = link_factory
+        @mappers = {
+          'data-centers' => data_center_mapper,
+          'environments' => environment_mapper,
+          'health-statuses' => health_status_mapper,
+          'infrastructure-providers' => infrastructure_provider_mapper,
+          'ip-address-roles' => ip_address_role_mapper,
+          'load-balancers' => load_balancer_mapper,
+          'machines' => machine_mapper,
+          'nodes' => node_mapper,
+          'node-ip-addresses' => node_ip_address_mapper,
+          'regions' => region_mapper,
+          'rotation-statuses' => rotation_status_mapper,
+          'services' => service_mapper,
+          'service-groups' => service_group_mapper,
+          'service-instances' => service_instance_mapper,
+          'service-instance-ports' => service_instance_port_mapper,
+          'service-types' => service_type_mapper,
+          'status-types' => status_type_mapper
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def environment_mapper
-      ->(e) {
-        {
-          'key' => e['key'],
-          'name' => e['name'],
-          'aka' => e['aka'],
-          'description' => e['description'],
-          
-          # FIXME Deprecated, don't use.
-          'rank' => e['rank']
+      end
+
+      # Maps a list of items.
+      # - type: Item type
+      # - items: Item list
+      def map_all(type, items)
+        mapper = mapper_for type
+        result = []
+        items.each { |i| result << mapper.call(i) }
+        result
+      end
+      
+      # Maps a single item.
+      # - type: Item type
+      # - item: Item
+      def map_one(type, item)
+        mapper_for(type).call item
+      end
+      
+      private
+      
+      # Returns a link for the specified item, or nil if key_value is nil.
+      def link_for(type, key_name, key_value)
+        # Do nil check here (even though link factory does it too) since the unit test requires this behavior.
+        return key_value.nil? ? nil : @link_factory.link(type, key_name, key_value)
+      end
+      
+      # Returns a mapper lambda for the specified type.
+      def mapper_for(type)
+        mapper = @mappers[type]
+        raise ArgumentError, "Unknown type: #{type}" if mapper.nil?
+        mapper
+      end
+      
+      # Returns a mapper lambda.
+      def data_center_mapper
+        ->(dc) {
+          {
+            'key' => dc['key'],
+            'name' => dc['name'],
+            'region' => link_for('regions', 'key', dc['region'])
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def health_status_mapper
-      ->(hs) {
-        {
-          'key' => hs['key'],
-          'name' => hs['name'],
-          'statusType' => link_for('status-types', 'key', hs['statusType'])
+      end
+      
+      # Returns a mapper lambda.
+      def environment_mapper
+        ->(e) {
+          {
+            'key' => e['key'],
+            'name' => e['name'],
+            'aka' => e['aka'],
+            'description' => e['description'],
+            
+            # FIXME Deprecated, don't use.
+            'rank' => e['rank']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def infrastructure_provider_mapper
-      ->(ip) {
-        {
-          'key' => ip['key'],
-          'name' => ip['name']
+      end
+      
+      # Returns a mapper lambda.
+      def health_status_mapper
+        ->(hs) {
+          {
+            'key' => hs['key'],
+            'name' => hs['name'],
+            'statusType' => link_for('status-types', 'key', hs['statusType'])
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def ip_address_role_mapper
-      # Suppressing IP addresses since we don't import those from master files.
-      ->(r) {
-        {
-          'serviceInstance' => link_for('service-instances', 'key', r['serviceInstance']),
-          'name' => r['name'],
-          'description' => r['description']
+      end
+      
+      # Returns a mapper lambda.
+      def infrastructure_provider_mapper
+        ->(ip) {
+          {
+            'key' => ip['key'],
+            'name' => ip['name']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def load_balancer_mapper
-      ->(lb) {
-        {
-          'name' => lb['name'],
-          'type' => lb['type'],
-          'ipAddress' => lb['ipAddress'],
-          'dataCenter' => link_for('data-centers', 'key', lb['dataCenter']),
-          'apiUrl' => lb['apiUrl']
+      end
+      
+      # Returns a mapper lambda.
+      def ip_address_role_mapper
+        # Suppressing IP addresses since we don't import those from master files.
+        ->(r) {
+          {
+            'serviceInstance' => link_for('service-instances', 'key', r['serviceInstance']),
+            'name' => r['name'],
+            'description' => r['description']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def machine_mapper
-      ->(m) {
-        {
-          'name' => m['name'],
-          'ipAddress' => m['ipAddress'],
-          'fqdn' => m['fqdn'],
-          'hostname' => m['hostname'],
-          'domain' => m['domain'],
-          'os' => m['os'],
-          'platform' => m['platform'],
-          'platformVersion' => m['platformVersion']
+      end
+      
+      # Returns a mapper lambda.
+      def load_balancer_mapper
+        ->(lb) {
+          {
+            'name' => lb['name'],
+            'type' => lb['type'],
+            'ipAddress' => lb['ipAddress'],
+            'dataCenter' => link_for('data-centers', 'key', lb['dataCenter']),
+            'apiUrl' => lb['apiUrl']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def node_mapper
-      ->(n) {
-        service_instance = n['serviceInstance']
-        ip_addresses = n['ipAddresses']
-        si_ref = link_for('service-instances', 'key', service_instance)
-        
-        result = {
-          'name' => n['name'],
-          'serviceInstance' => si_ref,
-          'machine' => link_for('machines', 'name', n['machine'])
+      end
+      
+      # Returns a mapper lambda.
+      def machine_mapper
+        ->(m) {
+          {
+            'name' => m['name'],
+            'ipAddress' => m['ipAddress'],
+            'fqdn' => m['fqdn'],
+            'hostname' => m['hostname'],
+            'domain' => m['domain'],
+            'os' => m['os'],
+            'platform' => m['platform'],
+            'platformVersion' => m['platformVersion']
+          }
         }
-        
+      end
+      
+      # Returns a mapper lambda.
+      def node_mapper
+        ->(n) {
+          service_instance = n['serviceInstance']
+          ip_addresses = n['ipAddresses']
+          si_ref = link_for('service-instances', 'key', service_instance)
+          
+          result = {
+            'name' => n['name'],
+            'serviceInstance' => si_ref,
+            'machine' => link_for('machines', 'name', n['machine'])
+          }
+          
 =begin
       if ip_addresses
         result['ipAddresses'] = []
@@ -178,95 +177,95 @@ module Seiso
       end
 =end
         
-        result
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def node_ip_address_mapper
-      # Currently suppressing rotation status and endpoints since we don't import those from master files
-      ->(nip) {
-        {
-          'node' => link_for('nodes', 'name', nip['node']),
-          'ipAddressRole' => link_for('ip-address-roles', 'name', nip['ipAddressRole']),
-          'ipAddress' => nip['ipAddress']
+          result
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def region_mapper
-      ->(r) {
-        {
-          'key' => r['key'],
-          'name' => r['name'],
-          'regionKey' => r['regionKey'],
-          'infrastructureProvider' => link_for('infrastructure-providers', 'key', r['infrastructureProvider'])
+      end
+      
+      # Returns a mapper lambda.
+      def node_ip_address_mapper
+        # Currently suppressing rotation status and endpoints since we don't import those from master files
+        ->(nip) {
+          {
+            'node' => link_for('nodes', 'name', nip['node']),
+            'ipAddressRole' => link_for('ip-address-roles', 'name', nip['ipAddressRole']),
+            'ipAddress' => nip['ipAddress']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def rotation_status_mapper
-      ->(rs) {
-        {
-          'key' => rs['key'],
-          'name' => rs['name'],
-          'statusType' => link_for('status-types', 'key', rs['statusType'])
+      end
+      
+      # Returns a mapper lambda.
+      def region_mapper
+        ->(r) {
+          {
+            'key' => r['key'],
+            'name' => r['name'],
+            'regionKey' => r['regionKey'],
+            'infrastructureProvider' => link_for('infrastructure-providers', 'key', r['infrastructureProvider'])
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def service_mapper
-      ->(s) {
-        {
-          'key' => s['key'],
-          'name' => s['name'],
-          'description' => s['description'],
-          'group' => link_for('service-groups', 'key', s['group']),
-          'type' => link_for('service-types', 'key', s['type']),
-          'owner' => link_for('people', 'username', s['owner']),
-          'platform' => s['platform'],
-          'scmRepository' => s['scmRepository']
+      end
+      
+      # Returns a mapper lambda.
+      def rotation_status_mapper
+        ->(rs) {
+          {
+            'key' => rs['key'],
+            'name' => rs['name'],
+            'statusType' => link_for('status-types', 'key', rs['statusType'])
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def service_group_mapper
-      ->(sg) {
-        {
-          'key' => sg['key'],
-          'name' => sg['name']
+      end
+      
+      # Returns a mapper lambda.
+      def service_mapper
+        ->(s) {
+          {
+            'key' => s['key'],
+            'name' => s['name'],
+            'description' => s['description'],
+            'group' => link_for('service-groups', 'key', s['group']),
+            'type' => link_for('service-types', 'key', s['type']),
+            'owner' => link_for('people', 'username', s['owner']),
+            'platform' => s['platform'],
+            'scmRepository' => s['scmRepository']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def service_instance_mapper
-      ->(si) {
-        key = si['key']
-        ip_address_roles = si['ipAddressRoles']
-        ports = si['ports']
-        
-        result = {
-          'key' => key,
-          'service' => link_for('services', 'key', si['service']),
-          'environment' => link_for('environments', 'key', si['environment']),
-          'dataCenter' => link_for('data-centers', 'key', si['dataCenter']),
-          'loadBalanced' => si['loadBalanced'],
-          'loadBalancer' => link_for('loadBalancer', 'name', si['loadBalancer']),
-          'minCapacityDeploy' => si['minCapacityDeploy'],
-          'minCapacityOps' => si['minCapacityOps'],
+      end
+      
+      # Returns a mapper lambda.
+      def service_group_mapper
+        ->(sg) {
+          {
+            'key' => sg['key'],
+            'name' => sg['name']
+          }
+        }
+      end
+      
+      # Returns a mapper lambda.
+      def service_instance_mapper
+        ->(si) {
+          key = si['key']
+          ip_address_roles = si['ipAddressRoles']
+          ports = si['ports']
           
-          # FIXME Deprecated. This is a hardcoded field for an internal Expedia app, and we will remove it.
-          'eosManaged' => (si['eosManaged'] || false),
+          result = {
+            'key' => key,
+            'service' => link_for('services', 'key', si['service']),
+            'environment' => link_for('environments', 'key', si['environment']),
+            'dataCenter' => link_for('data-centers', 'key', si['dataCenter']),
+            'loadBalanced' => si['loadBalanced'],
+            'loadBalancer' => link_for('loadBalancer', 'name', si['loadBalancer']),
+            'minCapacityDeploy' => si['minCapacityDeploy'],
+            'minCapacityOps' => si['minCapacityOps'],
+            
+            # FIXME Deprecated. This is a hardcoded field for an internal Expedia app, and we will remove it.
+            'eosManaged' => (si['eosManaged'] || false),
+            
+            # FIXME Deprecated. This is the old name for the minCapacityOps field.
+            'requiredCapacity' => si['minCapacityOps']
+          }
           
-          # FIXME Deprecated. This is the old name for the minCapacityOps field.
-          'requiredCapacity' => si['minCapacityOps']
-        }
-        
 =begin
       if ip_address_roles
         result['ipAddressRoles'] = []
@@ -292,41 +291,42 @@ module Seiso
       end
 =end
         
-        result
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def service_instance_port_mapper
-      # Suppressing endpoints since we don't import those from master files.
-      ->(p) {
-        {
-          'serviceInstance' => link_for('service-instances', 'key', p['serviceInstance']),
-          'number' => p['number'],
-          'protocol' => p['protocol'],
-          'description' => p['description']
+          result
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def service_type_mapper
-      ->(st) {
-        {
-          'key' => st['key'],
-          'name' => st['name']
+      end
+      
+      # Returns a mapper lambda.
+      def service_instance_port_mapper
+        # Suppressing endpoints since we don't import those from master files.
+        ->(p) {
+          {
+            'serviceInstance' => link_for('service-instances', 'key', p['serviceInstance']),
+            'number' => p['number'],
+            'protocol' => p['protocol'],
+            'description' => p['description']
+          }
         }
-      }
-    end
-    
-    # Returns a mapper lambda.
-    def status_type_mapper
-      ->(st) {
-        {
-          'key' => st['key'],
-          'name' => st['name']
+      end
+      
+      # Returns a mapper lambda.
+      def service_type_mapper
+        ->(st) {
+          {
+            'key' => st['key'],
+            'name' => st['name']
+          }
+        }
+      end
+      
+      # Returns a mapper lambda.
+      def status_type_mapper
+        ->(st) {
+          {
+            'key' => st['key'],
+            'name' => st['name']
+          }
         }
-      }
+      end
     end
   end
 end

data/lib/seiso/import_master/uri_factory.rb

@@ -1,48 +1,48 @@
-# Seiso namespace module
 module Seiso
+  class ImportMaster
   
-  # URI factory.
-  #
-  # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-  # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-  # License:: Apache 2.0
-  
-  class UriFactory
-
-    # Creates a new URI factory for the given base URI.
-    # - base_uri: Base URI (e.g., http://seiso.example.com)
-    def initialize(base_uri)
-      @base_uri = base_uri
-      @v1_uri = "#{@base_uri}/v1"
-    end
+    # URI factory.
+    #
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class UriFactory
 
-    # Returns the URI for the given item type.
-    # - type: Item type (e.g., services, service-instances, ip-address-roles, etc.)
-    def type_uri(type)
-      if type == 'ip-address-roles'
-        raise ArgumentError, "ip-address-roles is not a top-level type"
-      else
-        return v1_uri type
+      # Creates a new URI factory for the given base URI.
+      # - base_uri: Base URI (e.g., http://seiso.example.com)
+      def initialize(base_uri)
+        @base_uri = base_uri
+        @v1_uri = "#{@base_uri}/v1"
       end
-    end
-    
-    # Returns the URI for the given item.
-    # - type: Item type
-    # - keys: One or more item keys, which collectively uniquely identify the item within the type
-    def item_uri(type, *keys)
-      if type == 'ip-address-roles'
-        return v1_uri "service-instances/#{keys[0]}/ip-address-roles/#{keys[1]}"
-      else
-        return v1_uri "#{type}/#{keys[0]}"
+      
+      # Returns the URI for the given item type.
+      # - type: Item type (e.g., services, service-instances, ip-address-roles, etc.)
+      def type_uri(type)
+        if type == 'ip-address-roles'
+          raise ArgumentError, "ip-address-roles is not a top-level type"
+        else
+          return v1_uri type
+        end
+      end
+      
+      # Returns the URI for the given item.
+      # - type: Item type
+      # - keys: One or more item keys, which collectively uniquely identify the item within the type
+      def item_uri(type, *keys)
+        if type == 'ip-address-roles'
+          return v1_uri "service-instances/#{keys[0]}/ip-address-roles/#{keys[1]}"
+        else
+          return v1_uri "#{type}/#{keys[0]}"
+        end
+      end
+      
+      private
+      
+      # Resolves a relative path to the full URI.
+      # - path: relative path
+      def v1_uri(path)
+        "#{@base_uri}/v1/#{path}"
       end
-    end
-    
-    private
-
-    # Resolves a relative path to the full URI.
-    # - path: relative path
-    def v1_uri(path)
-      "#{@base_uri}/v1/#{path}"
     end
   end
 end

data/refresh

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

data/seiso-import_master.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "seiso-import_master"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Imports Seiso data master files into Seiso."
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_runtime_dependency "seiso-connector", "~> 0.0"
+  spec.add_runtime_dependency "seiso-connector", "~> 0.0.1"
 end

data/test/test_master_item_mapper.rb

@@ -1,5 +1,5 @@
-require 'seiso/import_master/master_item_mapper'
 require 'minitest/autorun'
+require 'seiso/import_master/master_item_mapper'
 
 # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
 # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
@@ -13,7 +13,7 @@ class TestMasterItemMapper < MiniTest::Unit::TestCase
         { "foo" => "bar" }
       end
     end
-    @mapper = Seiso::MasterItemMapper.new link_factory
+    @mapper = Seiso::ImportMaster::MasterItemMapper.new link_factory
   end
 
   def test_map_all_illegal_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.1
 description: Supports self-service data management via version control, e.g. by using
   GitHub.
 email:
@@ -72,6 +72,7 @@ files:
 - lib/seiso/import_master/link_factory.rb
 - lib/seiso/import_master/master_item_mapper.rb
 - lib/seiso/import_master/uri_factory.rb
+- refresh
 - sample_conf/seiso.yml.sample
 - seiso-import_master.gemspec
 - test/test_master_item_mapper.rb