hammer_cli_csv 0.0.6 → 1.0.0

data/lib/hammer_cli_csv/content_hosts.rb

@@ -121,18 +121,15 @@ module HammerCLICsv
       end
 
       def export_foretello(csv)
-        @api.resource(:organizations)\
-          .call(:index, {:per_page => 999999})['results'].each do |organization|
-          @api.resource(:systems)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'organization_id' => foreman_organization(:name => organization['name'])
-                  })['results'].each do |system|
-            system = @api.resource(:systems)\
-              .call(:show, {
-                      'id' => system['uuid'],
-                      'fields' => 'full'
-                    })
+        @api.resource(:organizations).call(:index, {:per_page => 999999})['results'].each do |organization|
+          @api.resource(:systems).call(:index, {
+              'per_page' => 999999,
+              'organization_id' => foreman_organization(:name => organization['name'])
+          })['results'].each do |system|
+            system = @api.resource(:systems).call(:show, {
+                'id' => system['uuid'],
+                'fields' => 'full'
+            })
 
             name = system['name']
             count = 1
@@ -140,13 +137,13 @@ module HammerCLICsv
             environment = system['environment']['label']
             contentview = system['content_view']['name']
             hostcollections = CSV.generate do |column|
-              column << system['systemGroups'].collect do |hostcollection|
+              column << system['hostCollections'].collect do |hostcollection|
                 hostcollection['name']
               end
             end
             hostcollections.delete!("\n")
             virtual = system['facts']['virt.is_guest'] == 'true' ? 'Yes' : 'No'
-            host = system['virtual_host']
+            host = system['virtual_host'].nil? ? nil : system['virtual_host']['name']
             operatingsystem = "#{system['facts']['distribution.name']} " if system['facts']['distribution.name']
             operatingsystem += system['facts']['distribution.version'] if system['facts']['distribution.version']
             architecture = system['facts']['uname.machine']
@@ -161,11 +158,11 @@ module HammerCLICsv
             end
             products.delete!("\n")
             subscriptions = CSV.generate do |column|
-              column << @api.resource(:subscriptions)\
-                .call(:index, {
-                        'system_id' => system['uuid']
-                      })['results'].collect do |subscription|
-                "#{subscription['quantity']}|#{subscription['product_id']}|#{subscription['product_name']}"
+              column << @api.resource(:subscriptions).call(:index, {
+                  'organization_id' => organization['id'],
+                  'system_id' => system['uuid']
+              })['results'].collect do |subscription|
+                "#{subscription['consumed']}|#{subscription['product_id']}|#{subscription['product_name']}"
               end
             end
             subscriptions.delete!("\n")
@@ -183,13 +180,12 @@ module HammerCLICsv
           create_systems_from_csv(line)
         end
 
-        print 'Updating host and guest associations...' if option_verbose?
+        print 'Updating hypervisor and guest associations...' if option_verbose?
         @host_guests.each do |host_id, guest_ids|
-          @api.resource(:systems)\
-            .call(:update, {
-                    'id' => host_id,
-                    'guest_ids' => guest_ids
-                  })
+          @api.resource(:systems).call(:update, {
+              'id' => host_id,
+              'guest_ids' => guest_ids
+          })
         end
         puts 'done' if option_verbose?
       end
@@ -200,18 +196,16 @@ module HammerCLICsv
           # Fetching all content hosts is too slow and times out due to the complexity of the data
           # rendered in the json.
           # http://projects.theforeman.org/issues/6307
-          total = @api.resource(:systems)\
-            .call(:index, {
-                    'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                    'per_page' => 1
-                  })['total'].to_i
+          total = @api.resource(:systems).call(:index, {
+              'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+              'per_page' => 1
+          })['total'].to_i
           (total / 20 + 2).to_i.times do |page|
-            @api.resource(:systems)\
-              .call(:index, {
-                      'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                      'page' => page,
-                      'per_page' => 20
-                    })['results'].each do |system|
+            @api.resource(:systems).call(:index, {
+                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                'page' => page,
+                'per_page' => 20
+            })['results'].each do |system|
               @existing[line[ORGANIZATION]][system['name']] = system['uuid'] if system
             end
           end
@@ -220,45 +214,43 @@ module HammerCLICsv
         line[COUNT].to_i.times do |number|
           name = namify(line[NAME], number)
 
-          # TODO: w/ @daviddavis p-r
-          #subscriptions(line).each do |subscription|
-          #  katello_subscription(line[ORGANIZATION], :name => subscription[:number])
-          #end
-
           if !@existing[line[ORGANIZATION]].include? name
-            print "Creating system '#{name}'..." if option_verbose?
-            system_id = @api.resource(:systems)\
-              .call(:create, {
-                      'name' => name,
-                      'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                      'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
-                      'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
-                      'facts' => facts(name, line),
-                      'installed_products' => products(line)
-                    })['uuid']
+            print "Creating content host '#{name}'..." if option_verbose?
+            system_id = @api.resource(:systems).call(:create, {
+                'name' => name,
+                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
+                'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
+                'facts' => facts(name, line),
+                'installed_products' => products(line),
+                'service_level' => line[SLA],
+                'type' => 'system'
+            })['uuid']
             @existing[line[ORGANIZATION]][name] = system_id
           else
-            print "Updating system '#{name}'..." if option_verbose?
-            system_id = @api.resource(:systems)\
-              .call(:update, {
-                      'id' => @existing[line[ORGANIZATION]][name],
-                      'system' => {
-                        'name' => name,
-                        'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
-                        'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
-                        'facts' => facts(name, line),
-                        'installed_products' => products(line)
-                      }
-                    })['uuid']
+            print "Updating content host '#{name}'..." if option_verbose?
+            system_id = @api.resource(:systems).call(:update, {
+                'id' => @existing[line[ORGANIZATION]][name],
+                'system' => {
+                    'name' => name,
+                    'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
+                    'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
+                    'facts' => facts(name, line),
+                    'installed_products' => products(line)
+                },
+                'installed_products' => products(line),  # TODO: http://projects.theforeman.org/issues/9191,
+                'service_level' => line[SLA]
+            })['uuid']
           end
 
           if line[VIRTUAL] == 'Yes' && line[HOST]
-            raise "Host system '#{line[HOST]}' not found" if !@existing[line[ORGANIZATION]][line[HOST]]
+            raise "Content host '#{line[HOST]}' not found" if !@existing[line[ORGANIZATION]][line[HOST]]
             @host_guests[@existing[line[ORGANIZATION]][line[HOST]]] ||= []
             @host_guests[@existing[line[ORGANIZATION]][line[HOST]]] << "#{line[ORGANIZATION]}/#{name}"
           end
 
-          set_host_collections(system_id, line)
+          update_host_collections(system_id, line)
+          update_subscriptions(system_id, line)
 
           puts 'done' if option_verbose?
         end
@@ -270,35 +262,41 @@ module HammerCLICsv
 
       def facts(name, line)
         facts = {}
+        facts['system.certificate_version'] = '3.2'  # Required for auto-attach to work
         facts['network.hostname'] = name
         facts['cpu.core(s)_per_socket'] = line[CORES]
         facts['cpu.cpu_socket(s)'] = line[SOCKETS]
         facts['memory.memtotal'] = line[RAM]
         facts['uname.machine'] = line[ARCHITECTURE]
-        if line[OPERATINGSYSTEM].nil?
-          facts['distribution.name'] = nil
-          facts['distribution.version'] = nil
-        elsif line[OPERATINGSYSTEM].index(' ')
-          (facts['distribution.name'], facts['distribution.version']) = line[OPERATINGSYSTEM].split(' ')
-        else
-          (facts['distribution.name'], facts['distribution.version']) = ['RHEL', line[OPERATINGSYSTEM]]
-        end
+        (facts['distribution.name'], facts['distribution.version']) = os_name_version(line[OPERATINGSYSTEM])
         facts['virt.is_guest'] = line[VIRTUAL] == 'Yes' ? true : false
         facts['virt.uuid'] = "#{line[ORGANIZATION]}/#{name}" if facts['virt.is_guest']
+        facts['cpu.cpu(s)'] = 1
         facts
       end
 
-      def set_host_collections(system_id, line)
+      def update_host_collections(system_id, line)
         return nil if !line[HOSTCOLLECTIONS]
         CSV.parse_line(line[HOSTCOLLECTIONS]).each do |hostcollection_name|
-          @api.resource(:host_collections)\
-            .call(:add_systems, {
-                    'id' => katello_hostcollection(line[ORGANIZATION], :name => hostcollection_name),
-                    'system_ids' => [system_id]
-                  })
+          @api.resource(:host_collections).call(:add_systems, {
+              'id' => katello_hostcollection(line[ORGANIZATION], :name => hostcollection_name),
+              'system_ids' => [system_id]
+          })
         end
       end
 
+      def os_name_version(operatingsystem)
+        if operatingsystem.nil?
+          name = nil
+          version = nil
+        elsif operatingsystem.index(' ')
+          (name, version) = operatingsystem.split(' ')
+        else
+          (name, version) = ['RHEL', operatingsystem]
+        end
+        [name, version]
+      end
+
       def products(line)
         return nil if !line[PRODUCTS]
         products = CSV.parse_line(line[PRODUCTS]).collect do |product_details|
@@ -306,19 +304,40 @@ module HammerCLICsv
           # TODO: these get passed straight through to candlepin; probably would be better to process in server
           #       to allow underscore product_id here
           (product['productId'], product['productName']) = product_details.split('|')
+          product['arch'] = line[ARCHITECTURE]
+          product['version'] = os_name_version(line[OPERATINGSYSTEM])[1]
           product
         end
         products
       end
 
-      def subscriptions(line)
-        return nil if !line[SUBSCRIPTIONS]
-        subscriptions = CSV.parse_line(line[SUBSCRIPTIONS]).collect do |subscription_details|
-          subscription = {}
-          (subscription[:quantity], subscription[:number], subscription[:name]) = subscription_details.split('|')
-          subscription
+      def update_subscriptions(content_host_id, line)
+        existing_subscriptions = @api.resource(:subscriptions).call(:index, {
+            'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+            'per_page' => 999999,
+            'system_id' => content_host_id
+        })['results']
+        if existing_subscriptions.length > 0
+          @api.resource(:systems).call(:remove_subscriptions, {
+            'id' => content_host_id,
+            'subscriptions' => existing_subscriptions
+          })
         end
-        subscriptions
+
+        return if line[SUBSCRIPTIONS].nil? || line[SUBSCRIPTIONS].empty?
+
+        subscriptions = CSV.parse_line(line[SUBSCRIPTIONS], {:skip_blanks => true}).collect do |details|
+          (amount, sku, name) = details.split('|')
+          {
+            :id => katello_subscription(line[ORGANIZATION], :name => name),
+            :quantity => (amount.nil? || amount.empty? || amount == 'Automatic') ? 0 : amount
+          }
+        end
+
+        @api.resource(:subscriptions).call(:create, {
+            'system_id' => content_host_id,
+            'subscriptions' => subscriptions
+        })
       end
     end
   end

data/lib/hammer_cli_csv/content_view_filters.rb

@@ -20,13 +20,59 @@ module HammerCLICsv
 
       CONTENTVIEW = 'Content View'
       ORGANIZATION = 'Organization'
-      TYPE = 'Type'
       DESCRIPTION = 'Description'
+      TYPE = 'Type'
       REPOSITORIES = 'Repositories'
       RULES = 'Rules'
 
       def export
-        # TODO
+        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, COUNT, CONTENTVIEW, ORGANIZATION, TYPE, DESCRIPTION, REPOSITORIES, RULES]
+          @api.resource(:organizations).call(:index, {
+              :per_page => 999999
+          })['results'].each do |organization|
+            composite_contentviews = []
+            @api.resource(:content_views).call(:index, {
+                'per_page' => 999999,
+                'organization_id' => organization['id'],
+                'nondefault' => true
+            })['results'].each do |contentview|
+              @api.resource(:content_view_filters).call(:index, {
+                  'content_view_id' => contentview['id']
+              })['results'].collect do |filter|
+                filter_type = "#{filter['inclusion'] == true ? 'Include' : 'Exclude'} #{filter['type']}"
+
+                case filter['type']
+                when /rpm/
+                  rules = CSV.generate do |column|
+                    column << filter['rules'].collect do |rule|
+                      if rule['version']
+                        "#{rule['name']}|=|#{rule['version']}"
+                      elsif rule['min_version'] && rule['max_version']
+                        "#{rule['name']}|-|#{rule['min_version']},#{rule['max_version']}"
+                      elsif rule['min_version']
+                        "#{rule['name']}|>|#{rule['min_version']}"
+                      elsif rule['max_version']
+                        "#{rule['name']}|<|#{rule['max_version']}"
+                      end
+                    end
+                  end
+                  rules.delete!("\n")
+                when /erratum/
+                when /package_group/
+                else
+                  raise "Unknown filter rule type '#{filter['type']}'"
+                end
+                #puts "#{filter['type']} -> #{rule}"
+
+                name = contentview['name']
+                repositories = export_column(filter, 'repositories', 'name')
+                csv << [name, 1, contentview['name'], organization['name'], filter_type, filter['description'],
+                        repositories, rules]
+              end
+            end
+          end
+        end
       end
 
       def import
@@ -41,11 +87,10 @@ module HammerCLICsv
         @existing_filters[line[ORGANIZATION]] ||= {}
         if !@existing_filters[line[ORGANIZATION]][line[CONTENTVIEW]]
           @existing_filters[line[ORGANIZATION]][line[CONTENTVIEW]] ||= {}
-          @api.resource(:content_view_filters)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW])
-                  })['results'].each do |filter|
+          @api.resource(:content_view_filters).call(:index, {
+              'per_page' => 999999,
+              'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW])
+          })['results'].each do |filter|
             @existing_filters[line[ORGANIZATION]][line[CONTENTVIEW]][filter['name']] = filter['id'] if filter
           end
         end
@@ -60,36 +105,33 @@ module HammerCLICsv
           filter_id = @existing_filters[line[ORGANIZATION]][line[CONTENTVIEW]][name]
           if !filter_id
             print "Creating filter '#{name}' for content view filter '#{line[CONTENTVIEW]}'..." if option_verbose?
-            filter_id = @api.resource(:content_view_filters)\
-              .call(:create, {
-                      'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
-                      'name' => name,
-                      'description' => line[DESCRIPTION],
-                      'type' => filter_type(line[TYPE]),
-                      'inclusion' => filter_inclusion?(line[TYPE]),
-                      'repository_ids' => repository_ids
-                    })['id']
+            filter_id = @api.resource(:content_view_filters).call(:create, {
+                'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
+                'name' => name,
+                'description' => line[DESCRIPTION],
+                'type' => filter_type(line[TYPE]),
+                'inclusion' => filter_inclusion?(line[TYPE]),
+                'repository_ids' => repository_ids
+            })['id']
             @existing_filters[line[ORGANIZATION]][name] = filter_id
           else
             print "Updating filter '#{name}' for content view filter '#{line[CONTENTVIEW]}'..." if option_verbose?
-            @api.resource(:content_view_filters)\
-              .call(:update, {
-                      'id' => filter_id,
-                      'description' => line[DESCRIPTION],
-                      'type' => filter_type(line[TYPE]),
-                      'inclusion' => filter_inclusion?(line[TYPE]),
-                      'repository_ids' => repository_ids
-                    })
+            @api.resource(:content_view_filters).call(:update, {
+                'id' => filter_id,
+                'description' => line[DESCRIPTION],
+                'type' => filter_type(line[TYPE]),
+                'inclusion' => filter_inclusion?(line[TYPE]),
+                'repository_ids' => repository_ids
+            })
           end
 
           @existing_rules ||= {}
           @existing_rules[line[ORGANIZATION]] ||= {}
           @existing_rules[line[ORGANIZATION]][line[CONTENTVIEW]] ||= {}
-          @api.resource(:content_view_filter_rules)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'content_view_filter_id' => filter_id
-                  })['results'].each do |rule|
+          @api.resource(:content_view_filter_rules).call(:index, {
+              'per_page' => 999999,
+              'content_view_filter_id' => filter_id
+          })['results'].each do |rule|
             @existing_rules[line[ORGANIZATION]][line[CONTENTVIEW]][rule['name']] = rule
           end
 
@@ -119,11 +161,11 @@ module HammerCLICsv
 
             rule = @existing_rules[line[ORGANIZATION]][line[CONTENTVIEW]][name]
             if !rule
-              print "creating rule '#{rule}'..." if option_verbose?
+              print "." if option_verbose?
               rule = @api.resource(:content_view_filter_rules).call(:create, params)
               @existing_rules[line[ORGANIZATION]][line[CONTENTVIEW]][rule['name']] = rule
             else
-              print "updating rule '#{rule}'..." if option_verbose?
+              print "." if option_verbose?
               params['id'] = rule['id']
               @api.resource(:content_view_filter_rules).call(:update, params)
             end

data/lib/hammer_cli_csv/content_views.rb

@@ -15,13 +15,67 @@ module HammerCLICsv
       command_name 'content-views'
       desc         'import or export content-views'
 
+      LABEL = 'Label'
       ORGANIZATION = 'Organization'
       DESCRIPTION = 'Description'
       COMPOSITE = 'Composite'
-      REPOSITORIES = 'Repositories'
+      REPOSITORIES = 'Repositories or Composites'
+      FILTERS = 'Filters'
 
       def export
-        # TODO
+        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, COUNT, LABEL, ORGANIZATION, COMPOSITE, REPOSITORIES, FILTERS]
+          @api.resource(:organizations).call(:index, {
+              :per_page => 999999
+          })['results'].each do |organization|
+            composite_contentviews = []
+            @api.resource(:content_views).call(:index, {
+                'per_page' => 999999,
+                'organization_id' => organization['id'],
+                'nondefault' => true
+            })['results'].each do |contentview|
+
+              filters = CSV.generate do |column|
+                column << @api.resource(:content_view_filters).call(:index, {
+                    'content_view_id' => contentview['id']
+                })['results'].collect do |filter|
+                  rules = filter['rules'].collect do |rule|
+                    rule['name']
+                  end
+                  in_or_out = filter['inclusion'] == true ? 'Include' : 'Exclude'
+                  if filter['type'] == 'rpm'
+                    "#{ in_or_out }|#{ filter['type'] }|#{ rules.join(',')}"
+                  elsif filter['type'] == 'erratum'
+                    "#{ in_or_out }|#{ filter['type'] }|#{ rules['types'].join(',')}"
+                  else
+                    "???? #{filter['type']}"
+                  end
+                end
+              end
+              filters.delete!("\n")
+
+              name = contentview['name']
+              label = contentview['label']
+              orgname = organization['name']
+              composite = contentview['composite'] == true ? 'Yes' : 'No'
+              if composite == 'Yes'
+                contentviews = CSV.generate do |column|
+                  column << contentview['components'].collect do |component|
+                    component['content_view']['name']
+                  end
+                end
+                contentviews.delete!("\n")
+                composite_contentviews << [name, 1, label, orgname, composite, contentviews, filters]
+              else
+                repositories = export_column(contentview, 'repositories', 'name')
+                csv << [name, 1, label, orgname, composite, repositories, filters]
+              end
+            end
+            composite_contentviews.each do |contentview|
+              csv << contentview
+            end
+          end
+        end
       end
 
       def import
@@ -35,46 +89,75 @@ module HammerCLICsv
       def create_contentviews_from_csv(line)
         if !@existing_contentviews[line[ORGANIZATION]]
           @existing_contentviews[line[ORGANIZATION]] ||= {}
-          @api.resource(:content_views)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                    'nondefault' => true
-                  })['results'].each do |contentview|
+          @api.resource(:content_views).call(:index, {
+              'per_page' => 999999,
+              'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+              'nondefault' => true
+          })['results'].each do |contentview|
             @existing_contentviews[line[ORGANIZATION]][contentview['name']] = contentview['id'] if contentview
           end
         end
 
-        repository_ids = collect_column(line[REPOSITORIES]) do |repository|
-          katello_repository(line[ORGANIZATION], :name => repository)
+        is_composite = line[COMPOSITE] == 'Yes' ? true : false
+
+        if is_composite
+          composite_ids = collect_column(line[REPOSITORIES]) do |composite|
+            # TODO: export version and use it here
+            katello_contentviewversion(line[ORGANIZATION], composite, 1)
+          end
+        else
+          repository_ids = collect_column(line[REPOSITORIES]) do |repository|
+            katello_repository(line[ORGANIZATION], :name => repository)
+          end
         end
 
         line[COUNT].to_i.times do |number|
           name = namify(line[NAME], number)
-          composite = line[COMPOSITE] == 'Yes' ? true : false
 
           contentview_id = @existing_contentviews[line[ORGANIZATION]][name]
           if !contentview_id
             print "Creating content view '#{name}'..." if option_verbose?
-            contentview_id = @api.resource(:content_views)\
-              .call(:create, {
-                      'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                      'name' => name,
-                      'label' => labelize(name),
-                      'description' => line[DESCRIPTION],
-                      'composite' => composite,
-                      'repository_ids' => repository_ids
-                    })['id']
+            options = {
+                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                'name' => name,
+                'label' => labelize(name),
+                'description' => line[DESCRIPTION],
+                'composite' => is_composite
+            }
+            if is_composite
+              options['component_ids'] = composite_ids
+            else
+              options['repository_ids'] = repository_ids
+            end
+            contentview_id = @api.resource(:content_views).call(:create, options)['id']
             @existing_contentviews[line[ORGANIZATION]][name] = contentview_id
+            publish = true
           else
             print "Updating content view '#{name}'..." if option_verbose?
-            @api.resource(:content_views)\
-              .call(:update, {
-                      'id' => contentview_id,
-                      'description' => line[DESCRIPTION],
-                      'repository_ids' => repository_ids
-                    })
+            options = {
+                'id' => contentview_id,
+                'description' => line[DESCRIPTION]
+            }
+            if is_composite
+              options['component_ids'] = composite_ids
+            else
+              options['repository_ids'] = repository_ids
+            end
+            contentview = @api.resource(:content_views).call(:update, options)
+            publish = contentview['versions'].empty?
           end
+
+          # Content views cannot be used in composites unless a publish has occurred
+          # TODO: this command cannot be called more than once during a run, why?
+          if publish
+            args = %W{
+              --server #{ @server } --username #{ @username } --password #{ @server }
+              content-view publish --id #{ contentview_id }
+              --organization-id #{ foreman_organization(:name => line[ORGANIZATION]) }
+            }
+            hammer.run(args)
+          end
+
           puts 'done' if option_verbose?
         end