wooga_wooget 2.4.1 → 2.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec_status +82 -60
  3. data/Gemfile.lock +4 -1
  4. data/lib/wooget/cli.rb +10 -12
  5. data/lib/wooget/default.rb +10 -1
  6. data/lib/wooget/version.rb +1 -1
  7. data/wooget.gemspec +1 -0
  8. metadata +17 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0accaf89adcd09e3e7d2271ad7410e1a95cbad98
4
- data.tar.gz: a34c24d81bc7f9dfd28c5e857649e67d5adbfd92
3
+ metadata.gz: d17ab3255ceb1be1161ab8a10bc821076834b92f
4
+ data.tar.gz: 9450bf3d9cb108a645c13ad23de248b09bb7e90d
5
5
  SHA512:
6
- metadata.gz: 70638975f23658233905f2f3fcc5199b72372da8f312d372cbd8f7d8fa5e1e6f6dfc6675285ddd12f0a367f7f6c9bdfede5639ceb323cccf2b1db5e1c07d56d8
7
- data.tar.gz: 20f563d79fbce3d33fb8a56acf0069c7aa6bdf5013662a7542ae7dd2a751b9d1a2a7d726532af3f1338db9db404838bc2f0831a6a02c08c6c300f9887a518b02
6
+ metadata.gz: da809ffe61d14b1b8b094f3bd407df5664a64700464ba9e2335587e6cbf71868e8aa9ea659bb6a952a6ebcb2071d40be14eeb1be6a79999354c5c46093d8bce7
7
+ data.tar.gz: 32cb898305806f898cdd82be04e3ff9c7bf140dff7705e8df3ad6fa68c5b961f0e7613b22ca73b72cd7273457cb167689d02b35cab35d53c2502d9cb90966655
data/.rspec_status CHANGED
@@ -1,62 +1,84 @@
1
1
  example_id | status | run_time |
2
2
  --------------------------------- | ------ | --------------- |
3
- ./spec/default_spec.rb[1:1:1:1] | passed | 0.0012 seconds |
4
- ./spec/default_spec.rb[1:1:2:1] | passed | 0.00009 seconds |
5
- ./spec/default_spec.rb[1:1:3:1] | passed | 0.00008 seconds |
6
- ./spec/default_spec.rb[1:1:4:1] | passed | 0.00009 seconds |
7
- ./spec/default_spec.rb[1:1:4:2] | passed | 0.00042 seconds |
8
- ./spec/default_spec.rb[1:1:5:1] | passed | 0.00011 seconds |
9
- ./spec/default_spec.rb[1:1:5:2] | passed | 0.00077 seconds |
10
- ./spec/default_spec.rb[1:1:6:1] | passed | 0.0001 seconds |
11
- ./spec/default_spec.rb[1:1:6:2] | passed | 0.00011 seconds |
12
- ./spec/default_spec.rb[1:2:1:1:1] | passed | 0.00038 seconds |
13
- ./spec/default_spec.rb[1:2:1:1:2] | passed | 0.00037 seconds |
14
- ./spec/default_spec.rb[1:2:1:2:1] | passed | 0.00035 seconds |
15
- ./spec/default_spec.rb[1:2:1:2:2] | passed | 0.00034 seconds |
16
- ./spec/default_spec.rb[1:2:1:3:1] | passed | 0.00036 seconds |
17
- ./spec/default_spec.rb[1:2:1:3:2] | passed | 0.00038 seconds |
18
- ./spec/default_spec.rb[1:2:2:1:1] | passed | 0.00039 seconds |
19
- ./spec/default_spec.rb[1:2:2:1:2] | passed | 0.00034 seconds |
20
- ./spec/default_spec.rb[1:2:2:2:1] | passed | 0.00034 seconds |
21
- ./spec/default_spec.rb[1:2:2:2:2] | passed | 0.00035 seconds |
22
- ./spec/default_spec.rb[1:2:2:3:1] | passed | 0.00032 seconds |
23
- ./spec/default_spec.rb[1:2:2:3:2] | passed | 0.0004 seconds |
24
- ./spec/default_spec.rb[1:2:3:1:1] | passed | 0.0004 seconds |
25
- ./spec/default_spec.rb[1:2:3:1:2] | passed | 0.00038 seconds |
26
- ./spec/default_spec.rb[1:2:3:2:1] | passed | 0.00036 seconds |
27
- ./spec/default_spec.rb[1:2:3:2:2] | passed | 0.00036 seconds |
28
- ./spec/default_spec.rb[1:2:3:3:1] | passed | 0.00035 seconds |
29
- ./spec/default_spec.rb[1:2:3:3:2] | passed | 0.00036 seconds |
30
- ./spec/default_spec.rb[1:2:4:1] | passed | 0.00035 seconds |
31
- ./spec/default_spec.rb[1:2:4:2] | passed | 0.00033 seconds |
32
- ./spec/default_spec.rb[1:2:5:1] | passed | 0.00035 seconds |
33
- ./spec/default_spec.rb[1:2:5:2] | passed | 0.00037 seconds |
34
- ./spec/default_spec.rb[1:2:6:1] | passed | 0.00032 seconds |
35
- ./spec/default_spec.rb[1:2:6:2] | passed | 0.00036 seconds |
36
- ./spec/github_spec.rb[1:1:1:1] | passed | 0.00499 seconds |
37
- ./spec/github_spec.rb[1:1:2:1] | passed | 0.00052 seconds |
38
- ./spec/github_spec.rb[1:2:1:1] | passed | 0.00085 seconds |
39
- ./spec/github_spec.rb[1:2:2:1] | passed | 0.00041 seconds |
40
- ./spec/github_spec.rb[1:3:1] | passed | 0.00034 seconds |
41
- ./spec/github_spec.rb[1:3:2] | passed | 0.00064 seconds |
42
- ./spec/github_spec.rb[1:3:3] | passed | 0.00037 seconds |
43
- ./spec/github_spec.rb[1:4:1:1] | passed | 0.00037 seconds |
44
- ./spec/github_spec.rb[1:4:1:2] | passed | 0.00037 seconds |
45
- ./spec/github_spec.rb[1:4:2:1] | passed | 0.00062 seconds |
46
- ./spec/github_spec.rb[1:4:2:2] | passed | 0.0006 seconds |
47
- ./spec/github_spec.rb[1:4:3:1] | passed | 0.00035 seconds |
48
- ./spec/github_spec.rb[1:5:1] | passed | 0.00076 seconds |
49
- ./spec/github_spec.rb[1:5:2] | passed | 0.00041 seconds |
50
- ./spec/github_spec.rb[1:5:3] | passed | 0.00038 seconds |
51
- ./spec/github_spec.rb[1:6:1:1] | passed | 0.00206 seconds |
52
- ./spec/github_spec.rb[1:6:2:1] | passed | 0.00199 seconds |
53
- ./spec/github_spec.rb[1:6:3:1] | passed | 0.00371 seconds |
54
- ./spec/github_spec.rb[1:6:4:1] | passed | 0.00222 seconds |
55
- ./spec/github_spec.rb[1:6:5] | passed | 0.00216 seconds |
56
- ./spec/github_spec.rb[1:6:6] | passed | 0.002 seconds |
57
- ./spec/github_spec.rb[1:7:1:1] | passed | 0.00211 seconds |
58
- ./spec/github_spec.rb[1:7:1:2:1] | passed | 0.00193 seconds |
59
- ./spec/github_spec.rb[1:7:1:3:1] | passed | 0.00177 seconds |
60
- ./spec/github_spec.rb[1:7:1:4] | passed | 0.00189 seconds |
61
- ./spec/github_spec.rb[1:7:1:5] | passed | 0.00166 seconds |
62
- ./spec/github_spec.rb[1:7:2:1] | passed | 0.00169 seconds |
3
+ ./spec/cli_spec.rb[1:1:1:1:1] | passed | 0.00939 seconds |
4
+ ./spec/cli_spec.rb[1:1:1:1:2] | passed | 0.00181 seconds |
5
+ ./spec/cli_spec.rb[1:1:1:1:3] | passed | 0.00109 seconds |
6
+ ./spec/cli_spec.rb[1:1:1:1:4] | passed | 0.00105 seconds |
7
+ ./spec/cli_spec.rb[1:1:1:1:5] | passed | 0.00093 seconds |
8
+ ./spec/cli_spec.rb[1:1:1:1:6] | passed | 0.00137 seconds |
9
+ ./spec/cli_spec.rb[1:1:1:1:7:1:1] | passed | 0.00118 seconds |
10
+ ./spec/cli_spec.rb[1:1:1:1:7:2:1] | passed | 0.00113 seconds |
11
+ ./spec/cli_spec.rb[1:1:1:1:7:3:1] | passed | 0.00196 seconds |
12
+ ./spec/cli_spec.rb[1:1:1:2:1] | passed | 0.00098 seconds |
13
+ ./spec/cli_spec.rb[1:1:1:2:2] | passed | 0.00114 seconds |
14
+ ./spec/cli_spec.rb[1:1:1:2:3] | passed | 0.00112 seconds |
15
+ ./spec/cli_spec.rb[1:1:1:2:4] | passed | 0.00086 seconds |
16
+ ./spec/cli_spec.rb[1:1:1:2:5] | passed | 0.00114 seconds |
17
+ ./spec/cli_spec.rb[1:1:1:2:6] | passed | 0.00102 seconds |
18
+ ./spec/cli_spec.rb[1:1:1:2:7:1:1] | passed | 0.00094 seconds |
19
+ ./spec/cli_spec.rb[1:1:1:2:7:2:1] | passed | 0.0008 seconds |
20
+ ./spec/cli_spec.rb[1:1:1:2:7:3:1] | passed | 0.00127 seconds |
21
+ ./spec/default_spec.rb[1:1:1:1] | passed | 0.00014 seconds |
22
+ ./spec/default_spec.rb[1:1:2:1] | passed | 0.00007 seconds |
23
+ ./spec/default_spec.rb[1:1:3:1] | passed | 0.00009 seconds |
24
+ ./spec/default_spec.rb[1:1:4:1] | passed | 0.00007 seconds |
25
+ ./spec/default_spec.rb[1:1:4:2] | passed | 0.00052 seconds |
26
+ ./spec/default_spec.rb[1:1:5:1] | passed | 0.00019 seconds |
27
+ ./spec/default_spec.rb[1:1:5:2] | passed | 0.00018 seconds |
28
+ ./spec/default_spec.rb[1:1:6:1] | passed | 0.00015 seconds |
29
+ ./spec/default_spec.rb[1:1:6:2] | passed | 0.00015 seconds |
30
+ ./spec/default_spec.rb[1:2:1:1:1] | passed | 0.00037 seconds |
31
+ ./spec/default_spec.rb[1:2:1:1:2] | passed | 0.00033 seconds |
32
+ ./spec/default_spec.rb[1:2:1:2:1] | passed | 0.00036 seconds |
33
+ ./spec/default_spec.rb[1:2:1:2:2] | passed | 0.00033 seconds |
34
+ ./spec/default_spec.rb[1:2:1:3:1] | passed | 0.00042 seconds |
35
+ ./spec/default_spec.rb[1:2:1:3:2] | passed | 0.00037 seconds |
36
+ ./spec/default_spec.rb[1:2:2:1:1] | passed | 0.00034 seconds |
37
+ ./spec/default_spec.rb[1:2:2:1:2] | passed | 0.00032 seconds |
38
+ ./spec/default_spec.rb[1:2:2:2:1] | passed | 0.00031 seconds |
39
+ ./spec/default_spec.rb[1:2:2:2:2] | passed | 0.00032 seconds |
40
+ ./spec/default_spec.rb[1:2:2:3:1] | passed | 0.00033 seconds |
41
+ ./spec/default_spec.rb[1:2:2:3:2] | passed | 0.00031 seconds |
42
+ ./spec/default_spec.rb[1:2:3:1:1] | passed | 0.00029 seconds |
43
+ ./spec/default_spec.rb[1:2:3:1:2] | passed | 0.00036 seconds |
44
+ ./spec/default_spec.rb[1:2:3:2:1] | passed | 0.0003 seconds |
45
+ ./spec/default_spec.rb[1:2:3:2:2] | passed | 0.0003 seconds |
46
+ ./spec/default_spec.rb[1:2:3:3:1] | passed | 0.00034 seconds |
47
+ ./spec/default_spec.rb[1:2:3:3:2] | passed | 0.00032 seconds |
48
+ ./spec/default_spec.rb[1:2:4:1] | passed | 0.00029 seconds |
49
+ ./spec/default_spec.rb[1:2:4:2] | passed | 0.00032 seconds |
50
+ ./spec/default_spec.rb[1:2:5:1] | passed | 0.0003 seconds |
51
+ ./spec/default_spec.rb[1:2:5:2] | passed | 0.00036 seconds |
52
+ ./spec/default_spec.rb[1:2:6:1] | passed | 0.00036 seconds |
53
+ ./spec/default_spec.rb[1:2:6:2] | passed | 0.00038 seconds |
54
+ ./spec/default_spec.rb[1:2:6:3:1] | passed | 0.00037 seconds |
55
+ ./spec/default_spec.rb[1:2:6:3:2] | passed | 0.00039 seconds |
56
+ ./spec/default_spec.rb[1:2:6:4:1] | passed | 0.00037 seconds |
57
+ ./spec/default_spec.rb[1:2:6:4:2] | passed | 0.00038 seconds |
58
+ ./spec/github_spec.rb[1:1:1:1] | passed | 0.00042 seconds |
59
+ ./spec/github_spec.rb[1:1:2:1] | passed | 0.00035 seconds |
60
+ ./spec/github_spec.rb[1:2:1:1] | passed | 0.00082 seconds |
61
+ ./spec/github_spec.rb[1:2:2:1] | passed | 0.00033 seconds |
62
+ ./spec/github_spec.rb[1:3:1] | passed | 0.00032 seconds |
63
+ ./spec/github_spec.rb[1:3:2] | passed | 0.00058 seconds |
64
+ ./spec/github_spec.rb[1:3:3] | passed | 0.00031 seconds |
65
+ ./spec/github_spec.rb[1:4:1:1] | passed | 0.00035 seconds |
66
+ ./spec/github_spec.rb[1:4:1:2] | passed | 0.0003 seconds |
67
+ ./spec/github_spec.rb[1:4:2:1] | passed | 0.00052 seconds |
68
+ ./spec/github_spec.rb[1:4:2:2] | passed | 0.00051 seconds |
69
+ ./spec/github_spec.rb[1:4:3:1] | passed | 0.00028 seconds |
70
+ ./spec/github_spec.rb[1:5:1] | passed | 0.00072 seconds |
71
+ ./spec/github_spec.rb[1:5:2] | passed | 0.00037 seconds |
72
+ ./spec/github_spec.rb[1:5:3] | passed | 0.00051 seconds |
73
+ ./spec/github_spec.rb[1:6:1:1] | passed | 0.00202 seconds |
74
+ ./spec/github_spec.rb[1:6:2:1] | passed | 0.00531 seconds |
75
+ ./spec/github_spec.rb[1:6:3:1] | passed | 0.00246 seconds |
76
+ ./spec/github_spec.rb[1:6:4:1] | passed | 0.00207 seconds |
77
+ ./spec/github_spec.rb[1:6:5] | passed | 0.00217 seconds |
78
+ ./spec/github_spec.rb[1:6:6] | passed | 0.00195 seconds |
79
+ ./spec/github_spec.rb[1:7:1:1] | passed | 0.00295 seconds |
80
+ ./spec/github_spec.rb[1:7:1:2:1] | passed | 0.00217 seconds |
81
+ ./spec/github_spec.rb[1:7:1:3:1] | passed | 0.00203 seconds |
82
+ ./spec/github_spec.rb[1:7:1:4] | passed | 0.00224 seconds |
83
+ ./spec/github_spec.rb[1:7:1:5] | passed | 0.00204 seconds |
84
+ ./spec/github_spec.rb[1:7:2:1] | passed | 0.00198 seconds |
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- wooga_wooget (2.4.0)
4
+ wooga_wooget (2.4.1)
5
5
  activesupport-json_encoder (~> 1.1)
6
6
  curb (~> 0.8)
7
7
  octokit (~> 4.3)
@@ -70,6 +70,8 @@ GEM
70
70
  diff-lcs (>= 1.2.0, < 2.0)
71
71
  rspec-support (~> 3.5.0)
72
72
  rspec-support (3.5.0)
73
+ rspec-temp_dir (0.0.4)
74
+ rspec
73
75
  ruby-ll (2.1.2)
74
76
  ansi
75
77
  ast
@@ -100,6 +102,7 @@ DEPENDENCIES
100
102
  rake (= 10.5.0)
101
103
  rspec
102
104
  rspec-autotest
105
+ rspec-temp_dir
103
106
  wooga_wooget!
104
107
 
105
108
  BUNDLED WITH
data/lib/wooget/cli.rb CHANGED
@@ -75,7 +75,7 @@ module Wooget
75
75
 
76
76
  desc "version", "Prints the wooget's version information"
77
77
  def version
78
- puts "wooget version #{Wooget::VERSION}"
78
+ p "wooget version #{Wooget::VERSION}"
79
79
  end
80
80
  map %w(-v --version) => :version
81
81
 
@@ -181,7 +181,7 @@ module Wooget
181
181
 
182
182
  Paket.install options
183
183
  else
184
- abort "Project not found at #{options[:path]}"
184
+ raise "Project not found at #{options[:path]}"
185
185
  end
186
186
  p "Installed!"
187
187
  end
@@ -194,7 +194,7 @@ module Wooget
194
194
  if Util.is_a_unity_project_dir(options[:path]) or Util.is_a_wooget_package_dir(options[:path])
195
195
  Paket.update package, options
196
196
  else
197
- abort "Project not found at #{options[:path]}"
197
+ raise "Project not found at #{options[:path]}"
198
198
  end
199
199
  p "Updated!"
200
200
  end
@@ -271,23 +271,21 @@ module Wooget
271
271
 
272
272
  config = JSON.parse(File.read(config_location), symbolize_names: true)
273
273
 
274
+ #clean empty values
275
+ config[:credentials] = config[:credentials].keep_if {|key,value| !value.empty? }
276
+ config[:repos] = config[:repos].keep_if {|key,value| !value.empty? }
277
+
274
278
  Wooget.credentials.merge! config[:credentials]
275
279
  Wooget.repos.merge! config[:repos]
276
280
 
277
- if config[:repos][:default]
278
- Wooget.repos[:default] = config[:repos][:default]
279
- end
280
-
281
281
  #set default repo to whatever was passed on commandline (if anything)
282
282
  if options[:repo]
283
283
  overridden_repo = Wooget.repos[options[:repo]] || Wooget.repos[options[:repo].to_sym]
284
- abort "Repo '#{options[:repo]}' not found in conf - options are #{Wooget.repos.keys.join(", ")}" unless overridden_repo
284
+ raise "Repo '#{options[:repo]}' not found in conf - options are #{Wooget.repos.keys.join(", ")}" unless overridden_repo
285
285
 
286
286
  Wooget.repos[:default] = overridden_repo
287
287
  end
288
288
 
289
- #override settings with values from environment
290
-
291
289
  Wooget.log.debug "Acting as #{Wooget.credentials[:username]}"
292
290
  Wooget.log.debug "Default repo is #{Wooget.repo}"
293
291
  end
@@ -297,7 +295,7 @@ module Wooget
297
295
 
298
296
 
299
297
  def assert_package_dir
300
- abort "#{ get_path} doesn't appear to be a wooget package dir" unless Util.is_a_wooget_package_dir get_path
298
+ raise "#{ get_path} doesn't appear to be a wooget package dir" unless Util.is_a_wooget_package_dir get_path
301
299
  end
302
300
 
303
301
  def get_path
@@ -308,7 +306,7 @@ module Wooget
308
306
  def assert_dependencies
309
307
  %w( mono ).each do |dep|
310
308
  `type #{dep}`
311
- abort "Couldn't find #{dep} - please install!" unless $?.exitstatus == 0
309
+ raise "Couldn't find #{dep} - please install!" unless $?.exitstatus == 0
312
310
  end
313
311
  end
314
312
 
data/lib/wooget/default.rb CHANGED
@@ -20,6 +20,15 @@ module Wooget
20
20
  ENV['WOOGET_DEFAULT_REPO'] || DEFAULT_REPO
21
21
  end
22
22
 
23
+ def repo_list
24
+ ENV.reduce({}){|memo, (key,value)|
25
+ if key.start_with? 'WOOGET_REPO_'
26
+ memo = memo.merge({key.sub('WOOGET_REPO_','').downcase.to_sym => value})
27
+ end
28
+ memo
29
+ }
30
+ end
31
+
23
32
  def credentials
24
33
  {
25
34
  username: user_name,
@@ -29,7 +38,7 @@ module Wooget
29
38
  end
30
39
 
31
40
  def repos
32
- { default: default_repo }
41
+ repo_list().merge({ default: default_repo })
33
42
  end
34
43
  end
35
44
  end
data/lib/wooget/version.rb CHANGED
@@ -3,7 +3,7 @@ Encoding.default_external = Encoding::UTF_8
3
3
  Encoding.default_internal = Encoding::UTF_8
4
4
 
5
5
  module Wooget
6
- VERSION = "2.4.1".freeze
6
+ VERSION = "2.5.0".freeze
7
7
 
8
8
  POST_INSTALL= '
9
9
  _ _
data/wooget.gemspec CHANGED
@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
29
29
  gem.add_development_dependency "rake", "10.5.0"
30
30
  gem.add_development_dependency "rspec"
31
31
  gem.add_development_dependency "rspec-autotest"
32
+ gem.add_development_dependency "rspec-temp_dir"
32
33
  gem.add_development_dependency "ZenTest"
33
34
  gem.add_development_dependency "minitest"
34
35
  gem.add_development_dependency "httpclient", "2.8.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wooga_wooget
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.1
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Donald Hutchison
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-03-13 00:00:00.000000000 Z
11
+ date: 2017-03-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -136,6 +136,20 @@ dependencies:
136
136
  - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: rspec-temp_dir
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ type: :development
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: ZenTest
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -295,7 +309,7 @@ post_install_message: |2+
295
309
  \_/\_/ \___/ \___/ \__, |\___|\__(_)
296
310
  |___/
297
311
 
298
- unity package manager cli version 2.4.1!
312
+ unity package manager cli version 2.5.0!
299
313
 
300
314
  rdoc_options: []
301
315
  require_paths: