foreman_inventory_upload 0.9.1 → 0.9.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/scripts/uploader.sh.erb +4 -2
  3. data/lib/foreman_inventory_upload.rb +1 -1
  4. data/lib/foreman_inventory_upload/version.rb +1 -1
  5. metadata +6 -34
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 37af93eaa77a845bebfbc46d3904a5608a8e2b8200cfcfabc599407753f6645a
4
- data.tar.gz: d24c72e865a79f38d6c18cc03150c84d53f490fbbee7eb1ec1e0c8427660b9b7
3
+ metadata.gz: b70584c73786436bfa34fabe53f16e4e7107a89b49acc2cf9085eb0bb3be0dab
4
+ data.tar.gz: a7564f641fad2c18c7e2122d09591b720411eb403cc84fefc0579e14a7d57d55
5
5
  SHA512:
6
- metadata.gz: 86cf560ae79152df20b8d67055f33c9a6c2bd0d2445d1d937112e25dc7a2a8d20976422c60d2253d3c78b4d88d827ffcd0991c2cb7dce061b807382f75c3ee8c
7
- data.tar.gz: f9c1072fe694a11aba4472f8ec7631c1b8c69e45a3c45dffeb5544bee8a5947589a47087bd63a950805c863d1a5716fa9b1eb393fb6227d7e8dc1e8bccd9830e
6
+ metadata.gz: 8f2504be14024e4d71f0d751a0a7715c45535087c0a6b861f8392bebe2f2f1a06a1aa46c71bc68cf46bf026a839bba32eb2e27953c2e3bcd0b6c2333c263df9f
7
+ data.tar.gz: 9adcaae458723fa26775bcc233dddb3097c40eee965b3063c508ff1156604dc751c0614242bbfb992ca40d2e1f61732cd744ad70b9d6d5379c943170056647f0
data/app/views/scripts/uploader.sh.erb CHANGED
@@ -29,13 +29,15 @@ fi
29
29
  # /tmp/a b/x.pem
30
30
  # curl --cert /tmp/a\ b/x.pem
31
31
 
32
- mkdir -p done
32
+ SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE:-0}")")
33
+ DONE_DIR="$SCRIPT_DIR/done/"
34
+ mkdir -p $DONE_DIR
33
35
 
34
36
  for f in $FILES
35
37
  do
36
38
  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
37
39
  if [ $? -eq 0 ]; then
38
- mv $f done/
40
+ mv $f $DONE_DIR
39
41
  echo "Done: $f"
40
42
  fi
41
43
  done
data/lib/foreman_inventory_upload.rb CHANGED
@@ -43,7 +43,7 @@ module ForemanInventoryUpload
43
43
 
44
44
  def self.upload_url
45
45
  # for testing set ENV to 'https://ci.cloud.redhat.com/api/ingress/v1/upload'
46
- @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cloud.redhat.com/api/ingress/v1/upload'
46
+ @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cert.cloud.redhat.com/api/ingress/v1/upload'
47
47
  end
48
48
 
49
49
  def self.ensure_folder(folder)
data/lib/foreman_inventory_upload/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanInventoryUpload
2
- VERSION = '0.9.1'.freeze
2
+ VERSION = '0.9.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_inventory_upload
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Inventory upload team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-11-28 00:00:00.000000000 Z
11
+ date: 2019-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: katello
@@ -56,44 +56,16 @@ dependencies:
56
56
  name: rubocop
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ">="
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
- - !ruby/object:Gem::Dependency
70
- name: rubocop-performance
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
59
+ - - "~>"
81
60
  - !ruby/object:Gem::Version
82
- version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: rubocop-rails
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: '0'
61
+ version: 0.54.0
90
62
  type: :development
91
63
  prerelease: false
92
64
  version_requirements: !ruby/object:Gem::Requirement
93
65
  requirements:
94
- - - ">="
66
+ - - "~>"
95
67
  - !ruby/object:Gem::Version
96
- version: '0'
68
+ version: 0.54.0
97
69
  description: Foreman plugin that process & upload data to cloud based host inventory
98
70
  email:
99
71
  - rlavi@redhat.com, sshtein@redhat.com