roku_builder 3.8.4 → 3.8.5

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
  SHA1:
3
- metadata.gz: 8087cce204fbb03747f223436cb663446d5ff520
4
- data.tar.gz: d710e947824632dcaaafb4a9d3cc0784974d2d4d
3
+ metadata.gz: 8e69a8b0a723f44c117d5ad9ae4522dbb7aad0eb
4
+ data.tar.gz: 7255b70fa5193336e44fa93252310e6b0accea2a
5
5
  SHA512:
6
- metadata.gz: 96f1b41457fc63b034a662e9655bb8d307974d1c3bfc019e15fae3598017f069085b4ba0ddbfb8019b12c0263f01104da496e2baad1e7d923dd883bf81d55e24
7
- data.tar.gz: ddb03d31245fd4898a915cb13894bcee268af2eaeb40005fa6feeafcc7edb2cb3f594f96520dddb5f41b56b5fe94f6fbc318d5a58d7965c602e7f3fb19a4f14b
6
+ metadata.gz: 4c6ea13b6683e837ae814c9fd4132527711ee1935404010905c73a6466d3ea39be566a49900045e5124530009fbfd552c314171892ccd51022a744786ecff999
7
+ data.tar.gz: c9b6a34923ff4b7d47c02d635ded9633e0aa151d7bc90cacc5883105c875a5f8d1738094e559882f3e0788cfea40458378b343e7759789c1a87a4fda92cdfa32
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- roku_builder (3.8.4)
4
+ roku_builder (3.8.5)
5
5
  faraday (~> 0.9)
6
6
  faraday-digestauth (~> 0.2)
7
7
  git (~> 1.3)
@@ -126,8 +126,13 @@ module RokuBuilder
126
126
  configs[:package_config][:app_name_version] = "#{configs[:project_config][:app_name]} - #{configs[:stage]} - #{options[:build_version]}" if configs[:package_config]
127
127
  unless options[:outfile]
128
128
  pathname = File.join(options[:out_folder], "#{configs[:project_config][:app_name]}_#{configs[:stage]}_#{options[:build_version]}")
129
- configs[:package_config][:out_file] = pathname+".pkg" if configs[:package_config]
130
- configs[:build_config][:outfile] = pathname+".zip" if configs[:build_config]
129
+ if options[:out]
130
+ configs[:package_config][:out_file] = File.join(options[:out_folder], options[:out_file]) if configs[:package_config]
131
+ configs[:build_config][:outfile] = File.join(options[:out_folder], options[:out_file]) if configs[:build_config]
132
+ else
133
+ configs[:package_config][:out_file] = pathname+".pkg" if configs[:package_config]
134
+ configs[:build_config][:outfile] = pathname+".zip" if configs[:build_config]
135
+ end
131
136
  configs[:inspect_config][:pkg] = configs[:package_config][:out_file] if configs[:inspect_config] and configs[:package_config]
132
137
  end
133
138
  end
@@ -73,6 +73,11 @@ module RokuBuilder
73
73
  if options[:out]
74
74
  if options[:out].end_with?(".zip") or options[:out].end_with?(".pkg") or options[:out].end_with?(".jpg")
75
75
  options[:out_folder], options[:out_file] = Pathname.new(options[:out]).split.map{|p| p.to_s}
76
+ if options[:out_folder] = "." and not options[:out].start_with?(".")
77
+ options[:out_folder] = nil
78
+ else
79
+ options[:out_folder] = File.expand_path(options[:out_folder])
80
+ end
76
81
  else
77
82
  options[:out_folder] = options[:out]
78
83
  end
@@ -74,7 +74,6 @@ module RokuBuilder
74
74
  return code unless code = SUCCESS
75
75
  # Key #
76
76
  success = keyer.rekey(**configs[:key])
77
- logger.info "Key did not change" unless success
78
77
  # Package #
79
78
  options[:build_version] = build_version
80
79
  configs = ConfigManager.update_configs(configs: configs, options: options)
@@ -25,6 +25,7 @@ module RokuBuilder
25
25
  # check key
26
26
  newId = dev_id
27
27
  @logger.info("Key did not change") unless newId != oldId
28
+ @logger.debug(oldId + " -> " + newId)
28
29
  newId != oldId
29
30
  end
30
31
 
@@ -36,7 +37,7 @@ module RokuBuilder
36
37
  response = conn.get path
37
38
 
38
39
  dev_id = /Your Dev ID:\s*<font[^>]*>([^<]*)<\/font>/.match(response.body)
39
- dev_id ||= /Your Dev ID:[^>]*<\/label> ([^<]*)/.match(response.body)[1]
40
+ dev_id ||= /Your Dev ID:[^>]*<\/label> ([^<]*)/.match(response.body)
40
41
  dev_id = dev_id[1] if dev_id
41
42
  dev_id ||= "none"
42
43
  dev_id
@@ -2,5 +2,5 @@
2
2
 
3
3
  module RokuBuilder
4
4
  # Version of the RokuBuilder Gem
5
- VERSION = "3.8.4"
5
+ VERSION = "3.8.5"
6
6
  end
@@ -105,7 +105,7 @@ class KeyerTest < Minitest::Test
105
105
  # generator spitting out the same number twice
106
106
  # SEED=21894
107
107
  # SEED=31813
108
- dev_id = Proc.new { Random.rand(100) }
108
+ dev_id = Proc.new {"#{Random.rand(100)}"}
109
109
  keyer = RokuBuilder::Keyer.new(**device_config)
110
110
  key_changed = nil
111
111
  Faraday.stub(:new, connection, faraday) do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roku_builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.8.4
4
+ version: 3.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - greeneca
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-17 00:00:00.000000000 Z
11
+ date: 2016-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rubyzip