hammer_cli_import 0.10.21 → 0.10.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25088f5a97c86be652ed10b3a2ebcc4dc73a0a0
-  data.tar.gz: bb9ea09f5f929ee5e4a4b72a19e72589a5ac90dd
+  metadata.gz: fd3d933afab6a50e60af4b68843682dd96d5319e
+  data.tar.gz: 315248e774ddffbaed9ecb88cf3f93278940b1bf
 SHA512:
-  metadata.gz: 7fd5880f890d41cf33014f2b92588488b149eb608064087623fd6cd347b318acb16a8707c64818f773ef7e27b73d9f0ba2b2d9b14e4ca903cd9321ef57a92288
-  data.tar.gz: 9e632e1eb146607736c8052b06d31346a336a02ed7c9e77fd00fa06c1043e14cbd20b3a4cb5d477c1e9f0e39ef1432c39adb657cad520e0d42aecf6dae4f868f
+  metadata.gz: 7a2ce56ba645f8a5fc738aebcd86cac01b3e787f51bd0c58699e14c038d6e380d916af7d476faae27de386fe987e2102517d428587f5420be8466c45b97faa04
+  data.tar.gz: d4e246366c12b7064afda69b35eb0e7b81e51617ac832d53682688826c9a3cfb80678674129b15ac67d412b79965e4701dab15c5ae5bb032115546adc763547c

data/lib/hammer_cli_import/configfile.rb

@@ -86,6 +86,9 @@ module HammerCLIImport
         owning_org = lookup_entity_in_cache(:organizations,
                                             {'id' => get_translated_id(:organizations, data['org_id'].to_i)})
         org_name = owning_org['name'].gsub(/[^0-9a-zA-Z]*/, '').downcase
+        if org_name.empty?
+          org_name = 'orgid' + owning_org['id'].to_s
+        end
         chan_name = data['channel'].gsub(/[^0-9a-zA-Z_]/, '_').downcase
         return org_name + '-' + chan_name
       end
@@ -194,6 +197,12 @@ module HammerCLIImport
         # Everybody gets a name, which is 'path' with '/' chgd to '_'
         data['name'] = data['path'].gsub('/', '_')
 
+        # UTF8 names are Issues, for Pulp - downgrade
+        data['name'] = data['name'].gsub(/[^0-9a-zA-Z+\-\.]*/, '')
+        if data['name'].empty?
+           data['name'] = 'file_id' + data['file_id']
+        end
+
         # If we're not type='file', done - return data
         return data unless data['file_type'] == 'file'
 

data/lib/hammer_cli_import/version.rb

@@ -19,7 +19,7 @@
 
 module HammerCLIImport
   def self.version
-    @version ||= Gem::Version.new('0.10.21')
+    @version ||= Gem::Version.new('0.10.22')
   end
 end
 # vim: autoindent tabstop=2 shiftwidth=2 expandtab softtabstop=2 filetype=ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_import
 version: !ruby/object:Gem::Version
-  version: 0.10.21
+  version: 0.10.22
 platform: ruby
 authors:
 - "@mkollar"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli