hammer_cli_csv 0.0.6 → 1.0.0

data/test/helpers/command.rb

@@ -2,14 +2,14 @@
 module CommandTestHelper
 
   def with_params(params, &block)
-    context "with params "+params.to_s do
+    context "with params " + params.to_s do
       let(:with_params) { params }
-      self.instance_eval &block
+      self.instance_eval(&block)
     end
   end
 
   def it_should_call_action(action, params)
-    it "should call action "+action.to_s do
+    it "should call action " + action.to_s do
       arguments ||= respond_to?(:with_params) ? with_params : []
       cmd.resource.resource_class.expects_with(action, params)
       cmd.run(arguments)
@@ -33,7 +33,7 @@ module CommandTestHelper
       arguments ||= respond_to?(:with_params) ? with_params : []
 
       cmd.stubs(:context).returns({ :adapter => :test })
-      proc { cmd.run(arguments) }.must_output /.*##{column_name}#.*/
+      proc { cmd.run(arguments) }.must_output(/.*##{column_name}#.*/)
     end
   end
 

data/test/helpers/resource_disabled.rb

@@ -6,12 +6,12 @@ module CommandTestHelper
   def with_params(params, &block)
     context "with params "+params.to_s do
       let(:with_params) { params }
-      self.instance_eval &block
+      self.instance_eval(&block)
     end
   end
 
   def it_should_call_action(action, params)
-    it "should call action "+action.to_s do
+    it "should call action " + action.to_s do
       arguments ||= respond_to?(:with_params) ? with_params : []
       cmd.resource.resource_class.expects_with(action, params)
       cmd.run(arguments)
@@ -35,7 +35,7 @@ module CommandTestHelper
       arguments ||= respond_to?(:with_params) ? with_params : []
 
       cmd.stubs(:context).returns({ :adapter => :test })
-      proc { cmd.run(arguments) }.must_output /.*##{column_name}#.*/
+      proc { cmd.run(arguments) }.must_output(/.*##{column_name}#.*/)
     end
   end
 

data/test/hosts_test.rb

@@ -16,7 +16,7 @@ describe 'setup' do
       }
       stderr.must_equal ''
       stdout.split("\n").length.must_equal 2
-      stdout.must_match /.*dhcp129-000\.megacorp\.com.*/
+      stdout.must_match(/.*dhcp129-000\.megacorp\.com.*/)
 
       host_id = stdout.split("\n")[1].split(",")[0]
     end

data/test/roles_test.rb

@@ -41,13 +41,13 @@ describe 'roles tests' do
       }
       lines = stdout.split("\n")
       lines.length.must_equal 5
-      lines[3].must_match /.*damon.dials@megacorp\.com.*/
+      lines[3].must_match(/.*damon.dials@megacorp\.com.*/)
 
       id = lines[3].split(' ')[0]
       stdout,stderr = capture {
         hammer.run(%W{activation-key info --id #{id}}).must_equal HammerCLI::EX_OK
       }
-      stdout.split("\n")[0].must_match /.*damon.dials@megacorp.com/
+      stdout.split("\n")[0].must_match(/.*damon.dials@megacorp.com/)
     end
 
   end

data/test/setup_test.rb

@@ -14,7 +14,7 @@ describe 'setup' do
         hammer.run(%W{csv organizations -v --csv-file test/data/organizations.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*organization 'Mega Corporation'.*/
+      stdout.must_match(/.*organization 'Mega Corporation'.*/)
     end
   end
 
@@ -24,7 +24,7 @@ describe 'setup' do
         hammer.run(%W{csv locations -v --csv-file test/data/locations.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*Asia Pacific.*/
+      stdout.must_match(/.*Asia Pacific.*/)
     end
   end
 
@@ -34,7 +34,7 @@ describe 'setup' do
         hammer.run(%W{csv operating-systems -v --csv-file test/data/operatingsystems.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*operating system 'Fedora 18'.*/
+      stdout.must_match(/.*operating system 'Fedora 18'.*/)
     end
   end
 
@@ -44,7 +44,7 @@ describe 'setup' do
         hammer.run(%W{csv architectures -v --csv-file test/data/architectures.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*architecture 'x86_64'.*/
+      stdout.must_match(/.*architecture 'x86_64'.*/)
     end
   end
 
@@ -54,7 +54,7 @@ describe 'setup' do
         hammer.run(%W{csv partition-tables -v --csv-file test/data/partitiontables.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*ptable 'ext4 default'.*/
+      stdout.must_match(/.*ptable 'ext4 default'.*/)
     end
   end
 
@@ -64,7 +64,7 @@ describe 'setup' do
         hammer.run(%W{csv domains -v --csv-file test/data/domains.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*domain 'megacorp.com'.*/
+      stdout.must_match(/.*domain 'megacorp.com'.*/)
     end
   end
 
@@ -74,7 +74,7 @@ describe 'setup' do
         hammer.run(%W{csv puppet-environments -v --csv-file test/data/puppetenvironments.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*environment 'Development'.*/
+      stdout.must_match(/.*environment 'Development'.*/)
     end
   end
 
@@ -85,7 +85,7 @@ describe 'setup' do
       }
       stderr.must_equal ''
       stdout.split("\n").length.must_equal 255
-      stdout.must_match /.*host 'dhcp129-000\.megacorp\.com'.*/
+      stdout.must_match(/.*host 'dhcp129-000\.megacorp\.com'.*/)
     end
   end
 
@@ -95,7 +95,7 @@ describe 'setup' do
         hammer.run(%W{csv puppet-facts -v --csv-file test/data/puppetfacts.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*puppetfacts 'dhcp129-000.megacorp.com'.*/
+      stdout.must_match(/.*puppetfacts 'dhcp129-000.megacorp.com'.*/)
     end
   end
 
@@ -117,7 +117,7 @@ describe 'setup' do
         hammer.run(%W{csv products -v --csv-file test/data/products.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*product 'Point of Sale'.*/
+      stdout.must_match(/.*product 'Point of Sale'.*/)
     end
   end
 
@@ -127,7 +127,7 @@ describe 'setup' do
         hammer.run(%W{csv lifecycle-environments -v --csv-file test/data/lifecycleenvironments.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*environment 'Development'.*/
+      stdout.must_match(/.*environment 'Development'.*/)
     end
   end
 
@@ -137,7 +137,7 @@ describe 'setup' do
         hammer.run(%W{csv system-groups -v --csv-file test/data/systemgroups.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*system group 'Mega Corp HQ'.*/
+      stdout.must_match(/.*system group 'Mega Corp HQ'.*/)
     end
   end
 
@@ -147,7 +147,7 @@ describe 'setup' do
         hammer.run(%W{csv systems -v --csv-file test/data/systems.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*system 'host0'.*/
+      stdout.must_match(/.*system 'host0'.*/)
     end
   end
 
@@ -157,7 +157,7 @@ describe 'setup' do
         hammer.run(%W{csv activation-keys -v --csv-file test/data/activationkeys.csv})
       }
       stderr.must_equal ''
-      stdout.must_match /.*activation key 'damon\.dials@megacorp\.com'.*/
+      stdout.must_match(/.*activation key 'damon\.dials@megacorp\.com'.*/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom McKay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_katello
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +76,7 @@ files:
 - lib/hammer_cli_csv/headpin_api.rb
 - lib/hammer_cli_csv/host_collections.rb
 - lib/hammer_cli_csv/hosts.rb
+- lib/hammer_cli_csv/i18n.rb
 - lib/hammer_cli_csv/import.rb
 - lib/hammer_cli_csv/installation_medias.rb
 - lib/hammer_cli_csv/lifecycle_environments.rb
@@ -84,6 +99,7 @@ files:
 - test/activation_keys_test.rb
 - test/apipie_resource_mock.rb
 - test/config.template.yml
+- test/content_hosts_test.rb
 - test/csv_test_helper.rb
 - test/data/activation-keys.csv
 - test/data/architectures.csv
@@ -113,7 +129,6 @@ files:
 - test/organizations_test.rb
 - test/roles_test.rb
 - test/setup_test.rb
-- test/systems_test.rb
 - test/users_test.rb
 homepage: http://github.com/Katello/hammer-cli-csv
 licenses:
@@ -143,6 +158,7 @@ test_files:
 - test/activation_keys_test.rb
 - test/apipie_resource_mock.rb
 - test/config.template.yml
+- test/content_hosts_test.rb
 - test/csv_test_helper.rb
 - test/data/activation-keys.csv
 - test/data/architectures.csv
@@ -172,5 +188,4 @@ test_files:
 - test/organizations_test.rb
 - test/roles_test.rb
 - test/setup_test.rb
-- test/systems_test.rb
 - test/users_test.rb

data/test/systems_test.rb

@@ -1,71 +0,0 @@
-require File.join(File.dirname(__FILE__), 'csv_test_helper')
-
-describe 'systems' do
-
-  extend CommandTestHelper
-
-  before :each do
-    HammerCLI::Settings.load_from_file 'test/config.yml'
-
-    @api = ApipieBindings::API.new({
-                                     :uri => HammerCLI::Settings.get(:csv, :host),
-                                     :username => HammerCLI::Settings.get(:csv, :username),
-                                     :password => HammerCLI::Settings.get(:csv, :password),
-                                     :api_version => 2
-                                   })
-
-  end
-
-  context "import" do
-
-    # TODO: Bug #4922 - system facts not updating via API
-    # http://projects.theforeman.org/issues/4922
-    it "update system facts" do
-
-      hostname = "host#{rand(10000)}"
-
-      # Create system
-      file = Tempfile.new('systems_test')
-      file.write("Name,Count,Organization,Environment,Content View,System Groups,Virtual,Host,OS,Arch,Sockets,RAM,Cores,SLA,Products,Subscriptions\n")
-      file.write("#{hostname},1,Mega Corporation,Library,Default Organization View,Mega Corp HQ,No,,RHEL 6.4,x86_64,1,4,1,Standard,,\n")
-      file.rewind
-
-      stdout,stderr = capture {
-        hammer.run(%W{-v csv:systems --csv-file #{file.path}})
-      }
-      stderr.must_equal ''
-      stdout[0..-2].must_equal "Creating system '#{hostname}'...done\nUpdating host and guest associations...done"
-      file.unlink
-
-      # Update system
-      file = Tempfile.new('systems_test')
-      file.write("Name,Count,Organization,Environment,Content View,System Groups,Virtual,Host,OS,Arch,Sockets,RAM,Cores,SLA,Products,Subscriptions\n")
-      file.write("#{hostname},1,Mega Corporation,Library,Default Organization View,Mega Corp HQ,No,,RHEL 6.4,x86_64,1,8,1,Standard,,\n")
-      file.rewind
-
-      stdout,stderr = capture {
-        hammer.run(%W{-v csv:systems --csv-file #{file.path}})
-      }
-      stderr.must_equal ''
-      stdout[0..-2].must_equal "Updating system '#{hostname}'...done\nUpdating host and guest associations...done"
-      file.unlink
-
-      # Verify system
-      system = @api.resource(:systems).call(:index, {
-                                              'organization_id' => 'megacorp',
-                                              'search' => "name=\"#{hostname}\""
-                                            })['results']
-      system.wont_be_nil
-      system.wont_be_empty
-      system[0]['name'].must_equal hostname
-
-      # Clean up
-      # TODO: Bug #4921 - bulk remove systems error "user not set"
-      # http://projects.theforeman.org/issues/4921
-      @api.resource(:systems).call(:destroy, {
-                                              'id' => system[0]['id']
-                                             })
-    end
-
-  end
-end