fwtoolkit 2.2.2 → 2.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fwtoolkit/cli/ext/thor.rb +0 -1
  3. data/lib/fwtoolkit/cli/project.rb +3 -1
  4. data/lib/fwtoolkit/config.rb +18 -6
  5. data/lib/fwtoolkit/config/config.sample +3 -4
  6. data/lib/fwtoolkit/version.rb +1 -1
  7. data/templates/bitrise/bitrise.yml.tt +0 -5
  8. data/templates/default_project/bitrise/bitrise.yml.tt +0 -5
  9. metadata +27 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a5344d26e5b11558751b13476d946bc43827910e5abb797570a2f38f083ff72a
4
- data.tar.gz: a5bb466682a76f48d74a4591d486e4af85131a3a96d67d11720e351a7c694bbb
3
+ metadata.gz: f83428ee28f172ec459fc0449654017e2b0e4809ff3afa1dafea9ce437e927ab
4
+ data.tar.gz: 3c058434e4d0200ac2d8096e33e3119d567797478780065d49696ca070c6ef8f
5
5
  SHA512:
6
- metadata.gz: 2f29aaa5742845602d7c75892aef10240f10b3190b9ea5303ad8f78b9ac23319da7e507336ed80311d56a9d29c253f21e4513de7af4fed3686e92280e32ccd8b
7
- data.tar.gz: 2716a83a211a8f75beb364e08d5becfbe83192c6a7848acd9af1d7ac17e2dd28953f97ddf624588994d795d7aba0c6c2b87be454497ea0592f8e7d7322cb6ced
6
+ metadata.gz: 400e2dca75a7f1ce53eaa3780e05f15fbb3580196d9305c19c8c1abe0131a11605313f6a003645334378695f6577964789bb1b395d4155c9dd8357429248e304
7
+ data.tar.gz: f5c1fb55439e062ee15db3c019a7aff3a874c4e9fdf75b2f8c9a066f4000a818b6ca3fff5c3bc56d2d4a7758e58a3b4f0213f4ddc7023c4115736ce530a8456c
data/lib/fwtoolkit/cli/ext/thor.rb CHANGED
@@ -6,7 +6,6 @@ class Thor
6
6
  def run(command, config={})
7
7
  command_output = run_base(command, config)
8
8
  if config[:raise_errors] && !$?.success?
9
- command_output.gsub!(/e\[\d+m/, '') #Stripping colors
10
9
  say "An error has occured while running: \"#{command}\"", :red
11
10
  say 'Command output:'
12
11
  raise Thor::Error, "\n***\n#{command_output}***"
data/lib/fwtoolkit/cli/project.rb CHANGED
@@ -53,8 +53,8 @@ module FWToolkit
53
53
 
54
54
  inside(destination_root) do
55
55
  run! "rvm install ruby-#{Config.ruby_version}"
56
- run! "rvm #{Config.ruby_version} do rvm --ruby-version --create ruby-#{Config.ruby_version}@#{@project_name}", {:capture => true}
57
56
  bundle_update
57
+ run! "rvm #{Config.ruby_version} do rvm --ruby-version --create ruby-#{Config.ruby_version}@#{@project_name}", {:capture => true}
58
58
  end
59
59
  end
60
60
 
@@ -73,6 +73,8 @@ module FWToolkit
73
73
  if File.exists? 'Gemfile'
74
74
  begin
75
75
  retried ||= false
76
+ run! "rvm ruby-#{Config.ruby_version}@#{@project_name} do gem update --system"
77
+ run! "rvm ruby-#{Config.ruby_version}@#{@project_name} do gem cleanup"
76
78
  run! "rvm ruby-#{Config.ruby_version}@#{@project_name} do gem install bundler"
77
79
  run! "rvm ruby-#{Config.ruby_version}@#{@project_name} do bundle"
78
80
  rescue Thor::Error
data/lib/fwtoolkit/config.rb CHANGED
@@ -9,16 +9,28 @@ module FWToolkit
9
9
  File.join(ENV['HOME'], '.fwtoolkit', 'config')
10
10
  end
11
11
 
12
+ def self.base_file
13
+ File.join(File.dirname(__FILE__), 'config', 'config.sample')
14
+ end
15
+
16
+ def self.config_path
17
+ File.dirname(config_file)
18
+ end
19
+
12
20
  def load!
13
21
  unless File.exists? config_file
14
- FileUtils.copy_file File.join(File.dirname(__FILE__), 'config', 'config.sample'), config_file
15
- raise "Please configure fwtoolkit by editing the file at path: #{config_file}"
22
+ puts "Config file not found"
23
+ unless File.exists? config_path
24
+ puts "Creating basic path"
25
+ FileUtils.mkpath config_path
26
+ end
27
+ FileUtils.copy_file base_file, config_file
16
28
  end
17
29
 
18
30
  default_config = { :organization_name => 'Future Workshops',
19
- :ruby_version => '2.5.1',
20
- :target_platform => '12.1',
21
- :ci_server_url => 'http://ci.office.futureworkshops.com',
31
+ :ruby_version => '2.6.3',
32
+ :target_platform => '13.1',
33
+ :ci_server_url => 'https://app.bitrise.io/dashboard',
22
34
  :artifacts_tmp_dir => '/tmp/fwtoolkit/artifacts' }
23
35
 
24
36
  load_config! config_file
@@ -26,7 +38,7 @@ module FWToolkit
26
38
 
27
39
  def validate_config
28
40
  unless @config.has_key?(:developer_name)
29
- raise NameError, "Please configure fwtoolkit by editing the file at path: #{config_file}"
41
+ raise NameError, "Please configure fwtoolkit by editing the file at path: #{config_file}, and inform your name on developer_name"
30
42
  end
31
43
  end
32
44
 
data/lib/fwtoolkit/config/config.sample CHANGED
@@ -1,7 +1,6 @@
1
1
  #developer_name: 'MANDATORY'
2
2
 
3
3
  organization_name: 'Future Workshops'
4
- ruby_version: '2.1.5'
5
- target_platform: '8.0'
6
- ci_server_url: 'http://ci.office.futureworkshops.com'
7
-
4
+ ruby_version: '2.6.3'
5
+ target_platform: '13.0'
6
+ ci_server_url: 'https://app.bitrise.io/dashboard'
data/lib/fwtoolkit/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FWToolkit
2
- VERSION = "2.2.2"
2
+ VERSION = "2.2.3"
3
3
  end
data/templates/bitrise/bitrise.yml.tt CHANGED
@@ -170,11 +170,6 @@ workflows:
170
170
  - activate-ssh-key:
171
171
  run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
172
172
  - git-clone: {}
173
- - git-tag:
174
- run_if: .IsCI
175
- inputs:
176
- - tag: ci/$PROJECT_NAME/$BITRISE_TRIGGERED_WORKFLOW_ID/$BITRISE_GIT_BRANCH-$BITRISE_BUILD_NUMBER
177
- - tag_message: ''
178
173
  - recreate-user-schemes:
179
174
  inputs:
180
175
  - project_path: "$BITRISE_PROJECT_PATH"
data/templates/default_project/bitrise/bitrise.yml.tt CHANGED
@@ -170,11 +170,6 @@ workflows:
170
170
  - activate-ssh-key:
171
171
  run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
172
172
  - git-clone: {}
173
- - git-tag:
174
- run_if: .IsCI
175
- inputs:
176
- - tag: ci/$PROJECT_NAME/$BITRISE_TRIGGERED_WORKFLOW_ID/$BITRISE_GIT_BRANCH-$BITRISE_BUILD_NUMBER
177
- - tag_message: ''
178
173
  - recreate-user-schemes:
179
174
  inputs:
180
175
  - project_path: "$BITRISE_PROJECT_PATH"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fwtoolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.2
4
+ version: 2.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Future Workshops
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-26 00:00:00.000000000 Z
11
+ date: 2019-09-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec-rails
@@ -36,40 +36,40 @@ dependencies:
36
36
  requirements:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: 0.14.9
39
+ version: 0.14.12
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: 0.14.9
42
+ version: 0.14.12
43
43
  type: :development
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 0.14.9
49
+ version: 0.14.12
50
50
  - - "~>"
51
51
  - !ruby/object:Gem::Version
52
- version: 0.14.9
52
+ version: 0.14.12
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: cucumber
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: 1.3.20
59
+ version: 3.1.2
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: 1.3.20
62
+ version: 3.1.2
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - ">="
68
68
  - !ruby/object:Gem::Version
69
- version: 1.3.20
69
+ version: 3.1.2
70
70
  - - "~>"
71
71
  - !ruby/object:Gem::Version
72
- version: 1.3.20
72
+ version: 3.1.2
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: aruba-doubles
75
75
  requirement: !ruby/object:Gem::Requirement
@@ -116,40 +116,40 @@ dependencies:
116
116
  requirements:
117
117
  - - ">="
118
118
  - !ruby/object:Gem::Version
119
- version: 12.3.2
119
+ version: 13.0.0
120
120
  - - "~>"
121
121
  - !ruby/object:Gem::Version
122
- version: 12.3.2
122
+ version: 13.0.0
123
123
  type: :runtime
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
126
126
  requirements:
127
127
  - - ">="
128
128
  - !ruby/object:Gem::Version
129
- version: 12.3.2
129
+ version: 13.0.0
130
130
  - - "~>"
131
131
  - !ruby/object:Gem::Version
132
- version: 12.3.2
132
+ version: 13.0.0
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: bundler
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - ">="
138
138
  - !ruby/object:Gem::Version
139
- version: 2.0.1
139
+ version: 2.0.2
140
140
  - - "~>"
141
141
  - !ruby/object:Gem::Version
142
- version: 2.0.1
142
+ version: 2.0.2
143
143
  type: :runtime
144
144
  prerelease: false
145
145
  version_requirements: !ruby/object:Gem::Requirement
146
146
  requirements:
147
147
  - - ">="
148
148
  - !ruby/object:Gem::Version
149
- version: 2.0.1
149
+ version: 2.0.2
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 2.0.1
152
+ version: 2.0.2
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: multi_json
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -176,20 +176,20 @@ dependencies:
176
176
  requirements:
177
177
  - - ">="
178
178
  - !ruby/object:Gem::Version
179
- version: 1.8.1
179
+ version: 1.12.0
180
180
  - - "~>"
181
181
  - !ruby/object:Gem::Version
182
- version: 1.8.1
182
+ version: 1.12.0
183
183
  type: :runtime
184
184
  prerelease: false
185
185
  version_requirements: !ruby/object:Gem::Requirement
186
186
  requirements:
187
187
  - - ">="
188
188
  - !ruby/object:Gem::Version
189
- version: 1.8.1
189
+ version: 1.12.0
190
190
  - - "~>"
191
191
  - !ruby/object:Gem::Version
192
- version: 1.8.1
192
+ version: 1.12.0
193
193
  - !ruby/object:Gem::Dependency
194
194
  name: xcodebuild-rb
195
195
  requirement: !ruby/object:Gem::Requirement
@@ -216,20 +216,20 @@ dependencies:
216
216
  requirements:
217
217
  - - ">="
218
218
  - !ruby/object:Gem::Version
219
- version: 1.2.2
219
+ version: 2.0.0
220
220
  - - "~>"
221
221
  - !ruby/object:Gem::Version
222
- version: 1.2.2
222
+ version: 2.0.0
223
223
  type: :runtime
224
224
  prerelease: false
225
225
  version_requirements: !ruby/object:Gem::Requirement
226
226
  requirements:
227
227
  - - ">="
228
228
  - !ruby/object:Gem::Version
229
- version: 1.2.2
229
+ version: 2.0.0
230
230
  - - "~>"
231
231
  - !ruby/object:Gem::Version
232
- version: 1.2.2
232
+ version: 2.0.0
233
233
  description: A collection of iOS development tools used by Future Workshops
234
234
  email:
235
235
  - contact@futureworkshops.com
@@ -396,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
396
396
  - !ruby/object:Gem::Version
397
397
  version: '0'
398
398
  requirements: []
399
- rubygems_version: 3.0.3
399
+ rubygems_version: 3.0.6
400
400
  signing_key:
401
401
  specification_version: 4
402
402
  summary: Future Workshops project tools