asperalm 0.9.28 → 0.9.29

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: df69cf85adecf467b741020d6ad2affe425f989c5405e7f1be54898438d8a18c
4
- data.tar.gz: 7349baa7d7de9bb686df363fdf7fad012b0cb164ead78cc9ef8eda4422d905f1
3
+ metadata.gz: f713640fca529449d4a6d3b3dc830464e88fec962ca005ef4cbd12f064031e9a
4
+ data.tar.gz: c6e5534e9460fcbd016c12b576e5fba78a67184176d780d052730020a43f0c2a
5
5
  SHA512:
6
- metadata.gz: b1c9494af8b8312c68c4b8e2686da3bc65fa7c3bf264856d43b384c2dd56a8a73a1972f333107a2a03bc370818fe7ccc64c4cbc97f98d5ed183c70f751e6238e
7
- data.tar.gz: 4bdbdd6bd87eb98839270a25bc0f4126270317a7d5ad2228bcd2b5f75ce74ff2bd13e3536cb6192511f416e4c4ecf70ee32ef3620c5ec837ec582f8690ccc105
6
+ metadata.gz: ec71f16fbf3453c281c5b83e2aead98346b2e09311dbf616ad94aa71e1b19443b462c8111007b3298327ed36293c3844e20e33bd973f84097cca3c703e7ad1e4
7
+ data.tar.gz: ac270c1e06764717b17dbc3ab5ec4c1fc7cf11e81cca22e3b665262656325dd15028b90b82734aebaebf8e175896b9d56b82016091b755f1e702e70e8c369756
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Asperalm - A Ruby library for Aspera transfers and "Amelia", the _Multi Layer IBM Aspera_ Command Line Tool
2
2
 
3
- Version : 0.9.28
3
+ Version : 0.9.29
4
4
 
5
5
 
6
6
  _Laurent/2016-2018_
@@ -37,7 +37,7 @@ Once the gem is installed, `mlia` shall be accessible:
37
37
 
38
38
  ```bash
39
39
  $ mlia --version
40
- 0.9.28
40
+ 0.9.29
41
41
  ```
42
42
 
43
43
  ## First use
@@ -640,14 +640,23 @@ a text editor for file edition.
640
640
  * `--ui=text` forces a text environment, the URL or file path to open is displayed on
641
641
  terminal.
642
642
 
643
- ## Proxy Auto Configuration
643
+ ## Using HTTP and FASP Proxy
644
644
 
645
- The `pac` options allows specification of a "PAC" file, by its URL. Supported schemes are : http:, https: and file:.
645
+ A (forward) proxy may be used for two reasons:
646
+
647
+ * HTTP/S requests
648
+ * FASP transfers
649
+
650
+ To specify a HTTP proxy, set the HTTP_PROXY environment variable.
651
+
652
+ To specify a FASP proxy with "local" agent, set the appropriate transfer spec parameter or ascp parameter in transfer spec. (not possible tih node agent or connect agent).
653
+
654
+ The `fpac` option allows specification of a Proxy Auto Configuration (PAC) file, by its URL for local FASP agent. Supported schemes are : http:, https: and file:.
646
655
 
647
656
  The PAC file can be tested with command: `config proxy_check` , example:
648
657
 
649
658
  ```
650
- $ mlia config proxy_check --pac=file:///./proxy.pac http://www.example.com
659
+ $ mlia config proxy_check --fpac=file:///./proxy.pac http://www.example.com
651
660
  PROXY proxy.example.com:8080
652
661
  ```
653
662
 
@@ -1031,7 +1040,7 @@ mlia config list
1031
1040
  mlia config open
1032
1041
  mlia config overview
1033
1042
  mlia config plugins
1034
- mlia config proxy_check --pac=file:///./examples/proxy.pac https://eudemo.asperademo.com
1043
+ mlia config proxy_check --fpac=file:///./examples/proxy.pac https://eudemo.asperademo.com
1035
1044
  mlia console transfer current list
1036
1045
  mlia faspex nagios_check
1037
1046
  mlia faspex package list
@@ -1103,7 +1112,7 @@ mlia sync start --parameters=@json:'{"sessions":[{"name":"test","reset":true,"re
1103
1112
  ```bash
1104
1113
  $ mlia -h
1105
1114
  NAME
1106
- mlia -- a command line tool for Aspera Applications (v0.9.28)
1115
+ mlia -- a command line tool for Aspera Applications (v0.9.29)
1107
1116
 
1108
1117
  SYNOPSIS
1109
1118
  mlia COMMANDS [OPTIONS] [ARGS]
@@ -1170,7 +1179,7 @@ OPTIONS:
1170
1179
  --ascp-path=VALUE path to ascp
1171
1180
  --use-product=VALUE use ascp from specified product
1172
1181
  --smtp=VALUE smtp configuration (extended value: hash)
1173
- --pac=VALUE proxy auto configuration URL
1182
+ --fpac=VALUE proxy auto configuration URL
1174
1183
  -P, --presetVALUE load the named option preset from current config file
1175
1184
 
1176
1185
 
@@ -1 +1 @@
1
- 0.9.28
1
+ 0.9.29
@@ -86,7 +86,7 @@ module Asperalm
86
86
  self.options.add_opt_simple(:ascp_path,"path to ascp")
87
87
  self.options.add_opt_simple(:use_product,"use ascp from specified product")
88
88
  self.options.add_opt_simple(:smtp,"smtp configuration (extended value: hash)")
89
- self.options.add_opt_simple(:pac,"proxy auto configuration URL")
89
+ self.options.add_opt_simple(:fpac,"proxy auto configuration URL")
90
90
  self.options.add_opt_simple(:preset,"-PVALUE","load the named option preset from current config file")
91
91
  self.options.set_option(:use_generic_client,true)
92
92
  self.options.parse_options!
@@ -618,7 +618,7 @@ module Asperalm
618
618
  when :smtp_settings
619
619
  return {:type=>:single_object,:data=>email_settings}
620
620
  when :proxy_check
621
- pac_url=self.options.get_option(:pac,:mandatory)
621
+ pac_url=self.options.get_option(:fpac,:mandatory)
622
622
  server_url=self.options.get_next_argument("server url")
623
623
  return Main.result_status(Asperalm::ProxyAutoConfig.new(UriReader.read(pac_url)).get_proxy(server_url))
624
624
  else raise "error"
@@ -74,6 +74,7 @@ module Asperalm
74
74
  self.options.add_opt_boolean(:check_extension,"check extra file extensions")
75
75
  self.options.set_option(:file_access,:local)
76
76
  self.options.parse_options!
77
+ raise "skip_folder shall be an Array, use @json:[...]" unless @option_skip_folders.is_a?(Array)
77
78
  end
78
79
 
79
80
  # special tag to identify transfers related to generator
@@ -235,6 +235,7 @@ module Asperalm
235
235
  'vicar' => :image,
236
236
  'viff' => :image,
237
237
  'vsdx' => :office,
238
+ 'webm' => :video,
238
239
  'wb2' => :office,
239
240
  'wk1' => :office,
240
241
  'wk3' => :office,
@@ -131,10 +131,8 @@ module Asperalm
131
131
  end
132
132
 
133
133
  def gen_video_reencode()
134
- Utils.ffmpeg(@source,
135
- [],
136
- @destination,
137
- ['-t','60',
134
+ Utils.ffmpeg(@source,[],@destination,[
135
+ '-t','60',
138
136
  '-codec:v','libx264',
139
137
  '-profile:v','high',
140
138
  '-pix_fmt','yuv420p',
@@ -1,4 +1,3 @@
1
- require 'execjs'
2
1
  require 'uri'
3
2
  require 'resolv'
4
3
  require 'erb'
@@ -13,6 +12,8 @@ module Asperalm
13
12
 
14
13
  # get string representing proxy configuration
15
14
  def get_proxy(service_url)
15
+ # require at runtime, in case there is no js engine
16
+ require 'execjs'
16
17
  # set context for template
17
18
  context_self='127.0.0.1'
18
19
  context_host=URI.parse(service_url).host
@@ -13,6 +13,7 @@ module Asperalm
13
13
  return Net::HTTPS.start(proxy_uri.host, proxy_uri.port){|http|http.get(proxy_uri.path)}.body
14
14
  elsif proxy_uri.scheme.eql?('file')
15
15
  local_file_path=proxy_uri.path
16
+ raise "URL shall have a path, check syntax" if local_file_path.nil?
16
17
  local_file_path=File.expand_path(local_file_path.gsub(/^\//,'')) if local_file_path.match(/^\/(~|.|..)\//)
17
18
  return File.read(local_file_path)
18
19
  elsif proxy_uri.scheme.eql?('')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asperalm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.28
4
+ version: 0.9.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - Laurent Martin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-28 00:00:00.000000000 Z
11
+ date: 2019-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: xml-simple
@@ -154,6 +154,9 @@ dependencies:
154
154
  name: bundler
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
+ - - "~>"
158
+ - !ruby/object:Gem::Version
159
+ version: '1.0'
157
160
  - - ">"
158
161
  - !ruby/object:Gem::Version
159
162
  version: '1.14'
@@ -161,6 +164,9 @@ dependencies:
161
164
  prerelease: false
162
165
  version_requirements: !ruby/object:Gem::Requirement
163
166
  requirements:
167
+ - - "~>"
168
+ - !ruby/object:Gem::Version
169
+ version: '1.0'
164
170
  - - ">"
165
171
  - !ruby/object:Gem::Version
166
172
  version: '1.14'
@@ -171,6 +177,9 @@ dependencies:
171
177
  - - ">"
172
178
  - !ruby/object:Gem::Version
173
179
  version: '10.0'
180
+ - - "~>"
181
+ - !ruby/object:Gem::Version
182
+ version: '10.0'
174
183
  type: :development
175
184
  prerelease: false
176
185
  version_requirements: !ruby/object:Gem::Requirement
@@ -178,6 +187,9 @@ dependencies:
178
187
  - - ">"
179
188
  - !ruby/object:Gem::Version
180
189
  version: '10.0'
190
+ - - "~>"
191
+ - !ruby/object:Gem::Version
192
+ version: '10.0'
181
193
  - !ruby/object:Gem::Dependency
182
194
  name: rspec
183
195
  requirement: !ruby/object:Gem::Requirement
@@ -185,6 +197,9 @@ dependencies:
185
197
  - - ">"
186
198
  - !ruby/object:Gem::Version
187
199
  version: '3.0'
200
+ - - "~>"
201
+ - !ruby/object:Gem::Version
202
+ version: '3.0'
188
203
  type: :development
189
204
  prerelease: false
190
205
  version_requirements: !ruby/object:Gem::Requirement
@@ -192,6 +207,9 @@ dependencies:
192
207
  - - ">"
193
208
  - !ruby/object:Gem::Version
194
209
  version: '3.0'
210
+ - - "~>"
211
+ - !ruby/object:Gem::Version
212
+ version: '3.0'
195
213
  description: A powerful transfer gem and CLI for IBM Aspera products.
196
214
  email:
197
215
  - laurent.martin.aspera@fr.ibm.com