hammer_cli_csv 1.0.1 → 1.0.2

data/lib/hammer_cli_csv/locations.rb

@@ -1,32 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Locations CSV =-
-#
-# Columns
-#   Name
-#     - Name of the location.
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "location%d" -> "location1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#   Parent
-#     - Parent location
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class LocationsCommand < BaseCommand
@@ -36,10 +7,10 @@ module HammerCLICsv
       PARENT = 'Parent Location'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, PARENT]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, PARENT]
           @api.resource(:locations).call(:index, {:per_page => 999999})['results'].each do |location|
-            csv << [location['name'], 1, '']
+            csv << [location['name'], '']
           end
         end
       end
@@ -56,7 +27,7 @@ module HammerCLICsv
       end
 
       def create_locations_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           location_id = @existing[name]
           if !location_id

data/lib/hammer_cli_csv/operating_systems.rb

@@ -1,14 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class OperatingSystemsCommand < BaseCommand
@@ -16,16 +5,16 @@ module HammerCLICsv
       desc         'import or export operating systems'
 
       FAMILY = 'Family'
+      DESCRIPTION = 'Description'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, FAMILY]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, DESCRIPTION, FAMILY]
           @api.resource(:operatingsystems).call(:index, {:per_page => 999999})['results'].each do |operatingsystem|
             name = build_os_name(operatingsystem['name'], operatingsystem['major'], operatingsystem['minor'])
-            count = 1
             description = operatingsystem['description']
             family = operatingsystem['family']
-            csv << [name, count, description, family]
+            csv << [name, description, family]
           end
         end
       end
@@ -42,30 +31,25 @@ module HammerCLICsv
       end
 
       def create_operatingsystems_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        params =  {
+          'operatingsystem' => {
+            'family' => line[FAMILY],
+            'description' => line[DESCRIPTION]
+          }
+        }
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           (osname, major, minor) = split_os_name(name)
+          params['operatingsystem']['name'] = osname
+          params['operatingsystem']['major'] = major
+          params['operatingsystem']['minor'] = minor
           if !@existing.include? name
             print "Creating operating system '#{name}'..." if option_verbose?
-            @api.resource(:operatingsystems).call(:create, {
-                'operatingsystem' => {
-                    'name' => osname,
-                    'major' => major,
-                    'minor' => minor,
-                    'family' => line[FAMILY]
-                }
-            })
+            @api.resource(:operatingsystems).call(:create, params)
           else
             print "Updating operating system '#{name}'..." if option_verbose?
-            @api.resource(:operatingsystems).call(:update, {
-                'id' => @existing[name],
-                'operatingsystem' => {
-                    'name' => osname,
-                    'major' => major,
-                    'minor' => minor,
-                    'family' => line[FAMILY]
-                }
-            })
+            params['id'] = @existing[name]
+            @api.resource(:operatingsystems).call(:update, params)
           end
           print "done\n" if option_verbose?
         end

data/lib/hammer_cli_csv/organizations.rb

@@ -1,36 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Organizations CSV =-
-#
-# Columns
-#   Name
-#     - Name of the organization.
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "organization%d" -> "organization1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#   Org Label
-#     - Label of the organization.
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "organization%d" -> "organization1"
-#   Description
-#
-
-require 'hammer_cli'
-#require 'net/http'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class OrganizationsCommand < BaseCommand
@@ -41,16 +8,18 @@ module HammerCLICsv
       DESCRIPTION = 'Description'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, LABEL, DESCRIPTION]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, LABEL, DESCRIPTION]
 
           if @server_status['release'] == 'Headpin'
             @headpin.get(:organizations).each do |organization|
-              csv << [organization['name'], 1, organization['label'], organization['description']]
+              next if option_organization && organization['name'] != option_organization
+              csv << [organization['name'], organization['label'], organization['description']]
             end
           else
             @api.resource(:organizations).call(:index, {:per_page => 999999})['results'].each do |organization|
-              csv << [organization['name'], 1, organization['label'], organization['description']]
+              next if option_organization && organization['name'] != option_organization
+              csv << [organization['name'], organization['label'], organization['description']]
             end
           end
         end
@@ -68,10 +37,12 @@ module HammerCLICsv
       end
 
       def create_organizations_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
+          return if option_organization && name != option_organization
           label = namify(line[LABEL], number)
-          if !@existing.include? name
+          organization_id = @existing[name]
+          if organization_id.nil?
             print "Creating organization '#{name}'... " if option_verbose?
             @api.resource(:organizations).call(:create, {
                 'name' => name,
@@ -83,10 +54,11 @@ module HammerCLICsv
             })
           else
             print "Updating organization '#{name}'... " if option_verbose?
+            organization = @api.resource(:organizations).call(:show, {'id' => organization_id})
             @api.resource(:organizations).call(:update, {
-                'id' => foreman_organization(:name => name),
+                'id' => organization_id,
                 'organization' => {
-                    'id' => foreman_organization(:name => name),
+                    'id' => organization_id,
                     'description' => line[DESCRIPTION]
                 }
             })

data/lib/hammer_cli_csv/partition_tables.rb

@@ -1,50 +1,52 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Partition Tables CSV =-
-#
-# Columns
-#   Name
-#     - Partition table name
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "os%d" -> "os1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class PartitionTablesCommand < BaseCommand
       command_name 'partition-tables'
       desc         'import or export partition tables'
 
+      ORGANIZATIONS = 'Organizations'
+      LOCATIONS = 'Locations'
       OSFAMILY = 'OS Family'
       OPERATINGSYSTEMS = 'Operating Systems'
       LAYOUT = 'Layout'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, OSFAMILY, OPERATINGSYSTEMS, LAYOUT]
+        # TODO: partition-tables do not return their organizations or locations
+        # http://projects.theforeman.org/issues/11175
+        organizations_map = {}
+        @api.resource(:organizations).call(:index, {:per_page => 999999})['results'].each do |organization|
+          ptables = @api.resource(:ptables).call(:index, {'organization_id' => organization['id']})['results'].each do |ptable|
+            organizations_map[ptable['name']] ||= []
+            organizations_map[ptable['name']] << organization['name']
+          end
+        end
+        locations_map = {}
+        @api.resource(:locations).call(:index, {:per_page => 999999})['results'].each do |location|
+          ptables = @api.resource(:ptables).call(:index, {'location_id' => location['id']})['results'].each do |ptable|
+            locations_map[ptable['name']] ||= []
+            locations_map[ptable['name']] << location['name']
+          end
+        end
+
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, ORGANIZATIONS, LOCATIONS, OSFAMILY, OPERATINGSYSTEMS, LAYOUT]
           @api.resource(:ptables).call(:index, {:per_page => 999999})['results'].each do |ptable|
             ptable = @api.resource(:ptables).call(:show, {'id' => ptable['id']})
             name = ptable['name']
-            count = 1
             osfamily = ptable['os_family']
             layout = ptable['layout']
-            csv << [name, count, osfamily, layout]
+            operatingsystems = export_column(ptable, 'operatingsystems', 'title')
+
+            organizations = CSV.generate do |column|
+              column << organizations_map[name] if organizations_map[name]
+            end
+            organizations.delete!("\n")
+            locations = CSV.generate do |column|
+              column << locations_map[name] if locations_map[name]
+            end
+            locations.delete!("\n")
+
+            csv << [name, organizations, locations, osfamily, operatingsystems, layout]
           end
         end
       end
@@ -61,32 +63,42 @@ module HammerCLICsv
       end
 
       def create_ptables_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        params = {
+          'ptable' => {
+            'os_family' => line[OSFAMILY],
+            'layout' => line[LAYOUT]
+          }
+        }
+        # Check for backwards compatibility
+        if apipie_check_param(:ptable, :create, 'ptable[operatingsystem_ids]')
+          operatingsystems = collect_column(line[OPERATINGSYSTEMS]) do |operatingsystem|
+            foreman_operatingsystem(:name => operatingsystem)
+          end
+          params['ptable']['operatingsystem_ids'] = operatingsystems
+        end
+        if apipie_check_param(:ptable, :create, 'ptable[organization_ids]')
+          organizations = collect_column(line[ORGANIZATIONS]) do |organization|
+            foreman_organization(:name => organization)
+          end
+          params['ptable']['organization_ids'] = organizations
+        end
+        if apipie_check_param(:ptable, :create, 'ptable[location_ids]')
+          locations = collect_column(line[LOCATIONS]) do |location|
+            foreman_location(:name => location)
+          end
+          params['ptable']['location_ids'] = locations
+        end
+
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
-          operatingsystem_ids = CSV.parse_line(line[OPERATINGSYSTEMS]).collect do |operatingsystem_name|
-            foreman_operatingsystem(:name => operatingsystem_name)
-          end if line[OPERATINGSYSTEMS]
+          params['ptable']['name'] = name
           if !@existing.include? name
-            print "Creating ptable '#{name}'... " if option_verbose?
-            @api.resource(:ptables).call(:create, {
-                                           'ptable' => {
-                                             'name' => name,
-                                             'os_family' => line[OSFAMILY],
-                                             'operatingsystem_ids' => operatingsystem_ids,
-                                             'layout' => line[LAYOUT]
-                                           }
-                                         })
+            print "Creating partition-table '#{name}'... " if option_verbose?
+            @api.resource(:ptables).call(:create, params)
           else
-            print "Updating ptable '#{name}'..." if option_verbose?
-            @api.resource(:ptables).call(:update, {
-                                           'id' => @existing[name],
-                                           'ptable' => {
-                                             'name' => name,
-                                             'os_family' => line[OSFAMILY],
-                                             'operatingsystem_ids' => operatingsystem_ids,
-                                             'layout' => line[LAYOUT]
-                                   }
-                             })
+            print "Updating partition-table '#{name}'..." if option_verbose?
+            params['id'] = @existing[name]
+            @api.resource(:ptables).call(:update, params)
           end
           print "done\n" if option_verbose?
         end

data/lib/hammer_cli_csv/products.rb

@@ -1,23 +1,10 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class ProductsCommand < BaseCommand
       command_name 'products'
       desc         _('import or export products')
 
-      option %w(--organization), 'ORGANIZATION', _('Only process organization matching this name')
-      option %w(--sync), 'true|false', _('Sync product repositories (default true)')
-
+      option %w(--[no-]sync), :flag, _('Sync product repositories (default true)'), :default => true
       LABEL = 'Label'
       ORGANIZATION = 'Organization'
       REPOSITORY = 'Repository'
@@ -26,8 +13,8 @@ module HammerCLICsv
       DESCRIPTION = 'Description'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, COUNT, LABEL, ORGANIZATION, REPOSITORY, REPOSITORY_TYPE, REPOSITORY_URL]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, LABEL, ORGANIZATION, REPOSITORY, REPOSITORY_TYPE, REPOSITORY_URL]
           @api.resource(:organizations).call(:index, {
               :per_page => 999999
           })['results'].each do |organization|
@@ -41,9 +28,10 @@ module HammerCLICsv
                   'product_id' => product['id'],
                   'organization_id' => organization['id']
               })['results'].each do |repository|
+                repository = @api.resource(:repositories).call(:show, {:id => repository['id']})
                 repository_type = repository['product_type'] == 'custom' ? 'Custom' : 'Red Hat'
                 repository_type += " #{repository['content_type'].capitalize}"
-                csv << [product['name'], 1, product['label'], organization['name'],
+                csv << [product['name'], product['label'], organization['name'],
                         repository['name'], repository_type, repository['url']]
               end
             end
@@ -87,7 +75,7 @@ module HammerCLICsv
           end
         end
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           product_id = @existing_products[line[ORGANIZATION]][name]
           if product_id.nil?
@@ -140,7 +128,7 @@ module HammerCLICsv
             @existing_repositories[line[ORGANIZATION] + name][line[LABEL]] = repository
           end
 
-          sync_repository(line, repository)
+          sync_repository(line, name, repository)
           puts _('done') if option_verbose?
         end
 
@@ -161,14 +149,14 @@ module HammerCLICsv
         end
       end
 
-      def sync_repository(line, repository)
-        if option_sync =~ (/A(true|1|yes)$/i) || HammerCLI::Settings.get(:csv, :products_sync) ||
-              (option_sync.nil? && HammerCLI::Settings.get(:csv, :products_sync).nil?)
+      def sync_repository(line, name, repository)
+        if (HammerCLI::Settings.get(:csv, :products_sync) == true || HammerCLI::Settings.get(:csv, :products_sync).nil?) &&
+            option_sync?
           if option_verbose?
             print _("syncing repository '%{repository_name}' in product '%{name}'...") %
-              {:repository_name => repository_name, :name => name}
+              {:repository_name => repository['name'], :name => name}
           end
-          if repository['sync_state'] == 'finished'
+          if repository['last_sync']
             print _("previously synced, skipping...") if option_verbose?
           else
             exec_sync_repository(line, repository)