licensed 2.3.1 → 2.3.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b184dfa3d4dce1ea45476c3c6100c8cdfaf1fb2d
4
- data.tar.gz: f7c2ecdf054be1bdc2d98efb8e268e0b89f37e01
3
+ metadata.gz: 56c8ff31beb8493afcf2d724011bd55765767d01
4
+ data.tar.gz: 87146893755f09eedfa24d532eaae569d3f4cf9f
5
5
  SHA512:
6
- metadata.gz: 99f503908e8528098546f02466407022e708b1f8c8d2245ebf8eb104d3ba0652c7b8c1902a45348bf927c610a418cf3ee3f905f652264ec3e9769c06121d24a0
7
- data.tar.gz: 256031960285da88bf28b3b1493a5f4bcc290a7776467e01820a83f339ce91751678bc21d046439912446ef4feece006a05f2d6aa0b410c22488d51ad4b44cff
6
+ metadata.gz: caa53e7f93ec83fa18c4b3264339035b9478e3dfb6ac0b3a50d3d52b06037f03d3c3c8446765fe52a330cb8d21fa48f580439000b6e1c8c024c68c940d6b3969
7
+ data.tar.gz: 5894bef9cc7e7824a7adbe5a341bd244dcf45e7816a49c77aac49141a6b750c26d2fc160c7c36cc0439c3fb19603674e9ad3e0b71f0f2737dda3f8e4c9a72faf
@@ -0,0 +1,115 @@
1
+ name: Create release
2
+
3
+ on: create
4
+
5
+ jobs:
6
+ tag_filter:
7
+ runs-on: ubuntu-latest
8
+ steps:
9
+ - uses: actions/bin/filter@master
10
+ with:
11
+ args: 'tag'
12
+
13
+ package_linux:
14
+ runs-on: ubuntu-latest
15
+ needs: tag_filter
16
+
17
+ steps:
18
+ - uses: actions/checkout@master
19
+ - name: Set up Ruby 2.6
20
+ uses: actions/setup-ruby@v1
21
+ with:
22
+ version: 2.6.x
23
+
24
+ - name: Build package
25
+ run: script/packages/linux
26
+ env:
27
+ VERSION: ${{github.event.ref}}
28
+
29
+ - uses: actions/upload-artifact@master
30
+ with:
31
+ name: licensed-${{github.event.ref}}-linux-x64.tar.gz
32
+ path: pkg/${{github.event.ref}}/licensed-${{github.event.ref}}-linux-x64.tar.gz
33
+
34
+ package_mac:
35
+ runs-on: macOS-latest
36
+ needs: tag_filter
37
+
38
+ steps:
39
+ - uses: actions/checkout@master
40
+ - name: Set up Ruby 2.6
41
+ uses: actions/setup-ruby@v1
42
+ with:
43
+ version: 2.6.x
44
+
45
+ - name: Build package
46
+ run: script/packages/mac
47
+ env:
48
+ VERSION: ${{github.event.ref}}
49
+
50
+ - uses: actions/upload-artifact@master
51
+ with:
52
+ name: licensed-${{github.event.ref}}-darwin-x64.tar.gz
53
+ path: pkg/${{github.event.ref}}/licensed-${{github.event.ref}}-darwin-x64.tar.gz
54
+
55
+ build_gem:
56
+ runs-on: ubuntu-latest
57
+ needs: tag_filter
58
+
59
+ steps:
60
+ - uses: actions/checkout@master
61
+ - name: Set up Ruby 2.6
62
+ uses: actions/setup-ruby@v1
63
+ with:
64
+ version: 2.6.x
65
+
66
+ - name: Build gem
67
+ run: gem build *.gemspec
68
+
69
+ - uses: actions/upload-artifact@master
70
+ with:
71
+ name: licensed-${{github.event.ref}}.gem
72
+ path: licensed-${{github.event.ref}}.gem
73
+
74
+ create_release:
75
+ runs-on: ubuntu-latest
76
+ needs: [package_linux, package_mac, build_gem]
77
+ steps:
78
+ - uses: actions/checkout@master
79
+ - uses: Roang-zero1/github-create-release-action@v1.0.2
80
+ env:
81
+ GITHUB_TOKEN: ${{ secrets.API_AUTH_TOKEN }}
82
+ VERSION_REGEX: "^[[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+"
83
+
84
+ upload_packages:
85
+ runs-on: ubuntu-latest
86
+ needs: [create_release]
87
+
88
+ steps:
89
+ - uses: actions/download-artifact@master
90
+ with:
91
+ name: licensed-${{github.event.ref}}-linux-x64.tar.gz
92
+ - uses: actions/download-artifact@master
93
+ with:
94
+ name: licensed-${{github.event.ref}}-darwin-x64.tar.gz
95
+
96
+ - name: Publish to GitHub Release
97
+ uses: Roang-zero1/github-upload-release-artifacts-action@v2.0.0
98
+ with:
99
+ args: licensed-${{github.event.ref}}-linux-x64.tar.gz licensed-${{github.event.ref}}-darwin-x64.tar.gz
100
+ env:
101
+ GITHUB_TOKEN: ${{secrets.API_AUTH_TOKEN}}
102
+
103
+ - uses: actions/download-artifact@master
104
+ with:
105
+ name: licensed-${{github.event.ref}}.gem
106
+
107
+ - name: Publish to RubyGems
108
+ run: |
109
+ mkdir -p $HOME/.gem
110
+ touch $HOME/.gem/credentials
111
+ chmod 0600 $HOME/.gem/credentials
112
+ printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
113
+ gem push *.gem
114
+ env:
115
+ GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
@@ -0,0 +1,207 @@
1
+ name: Test
2
+
3
+ on:
4
+ push:
5
+ tags: !*
6
+
7
+ jobs:
8
+ bower:
9
+ runs-on: ubuntu-latest
10
+ steps:
11
+ - uses: actions/checkout@master
12
+ - name: Setup node
13
+ uses: actions/setup-node@v1
14
+ with:
15
+ version: 8
16
+ - name: Set up Ruby
17
+ uses: actions/setup-ruby@v1
18
+ with:
19
+ version: 2.6.x
20
+ - name: Bootstrap
21
+ run: script/bootstrap
22
+ - name: Set up fixtures
23
+ run: script/source-setup/bower
24
+ - name: Run tests
25
+ run: script/test bower
26
+
27
+ bundler:
28
+ runs-on: ubuntu-latest
29
+ strategy:
30
+ matrix:
31
+ bundler: [ '~> 1.15.0', '~> 1.16.0', '~> 1.17.0', '~> 2.0.0' ]
32
+ steps:
33
+ - uses: actions/checkout@master
34
+ - name: Set up Ruby
35
+ uses: actions/setup-ruby@v1
36
+ with:
37
+ version: 2.6.x
38
+ - name: Set up Bundler
39
+ run: |
40
+ yes | gem uninstall bundler --all
41
+ gem install bundler -v "${{ matrix.bundler }}"
42
+ - name: Bootstrap
43
+ run: script/bootstrap
44
+ - name: Set up fixtures
45
+ run: script/source-setup/bundler
46
+ - name: Run tests
47
+ run: script/test bundler
48
+
49
+ cabal:
50
+ runs-on: ubuntu-latest
51
+ steps:
52
+ - uses: actions/checkout@master
53
+ - name: Set up Ruby
54
+ uses: actions/setup-ruby@v1
55
+ with:
56
+ version: 2.6.x
57
+ - name: Bootstrap
58
+ run: script/bootstrap
59
+ - name: Set up fixtures
60
+ run: script/source-setup/cabal
61
+ - name: Run tests
62
+ run: script/test cabal
63
+
64
+ core:
65
+ runs-on: ubuntu-latest
66
+ strategy:
67
+ matrix:
68
+ ruby: [ 2.4.x, 2.5.x, 2.6.x ]
69
+ steps:
70
+ - uses: actions/checkout@master
71
+ - name: Set up Ruby
72
+ uses: actions/setup-ruby@v1
73
+ with:
74
+ version: ${{matrix.ruby}}
75
+ - name: Set up Bundler
76
+ run: gem install bundler
77
+ - name: Bootstrap
78
+ run: script/bootstrap
79
+ - name: Build and lint
80
+ run: bundle exec rake rubocop build
81
+ - name: Core functionality tests
82
+ run: script/test core
83
+
84
+ dep:
85
+ runs-on: ubuntu-latest
86
+ steps:
87
+ - uses: actions/checkout@master
88
+ - name: Setup go
89
+ uses: actions/setup-go@v1
90
+ with:
91
+ go-version: 1.10.x
92
+ - name: Set up Ruby
93
+ uses: actions/setup-ruby@v1
94
+ with:
95
+ version: 2.6.x
96
+ - name: Bootstrap
97
+ run: script/bootstrap
98
+ - name: Set up fixtures
99
+ run: script/source-setup/go
100
+ - name: Run tests
101
+ run: script/test dep
102
+
103
+ go:
104
+ runs-on: ubuntu-latest
105
+ strategy:
106
+ matrix:
107
+ go: [ '1.7.x', '1.10.x', '1.11.1' ]
108
+ steps:
109
+ - uses: actions/checkout@master
110
+ - name: Setup go
111
+ uses: actions/setup-go@v1
112
+ with:
113
+ go-version: ${{ matrix.go }}
114
+ - name: Set up Ruby
115
+ uses: actions/setup-ruby@v1
116
+ with:
117
+ version: 2.6.x
118
+ - name: Bootstrap
119
+ run: script/bootstrap
120
+ - name: Set up fixtures
121
+ run: script/source-setup/go
122
+ - name: Run tests
123
+ run: script/test go
124
+
125
+ npm:
126
+ runs-on: ubuntu-latest
127
+ strategy:
128
+ matrix:
129
+ node_version: [ 8, 10, 12 ]
130
+ steps:
131
+ - uses: actions/checkout@master
132
+ - name: Setup node
133
+ uses: actions/setup-node@v1
134
+ with:
135
+ version: ${{ matrix.node_version }}
136
+ - name: Set up Ruby
137
+ uses: actions/setup-ruby@v1
138
+ with:
139
+ version: 2.6.x
140
+ - name: Bootstrap
141
+ run: script/bootstrap
142
+ - name: Set up fixtures
143
+ run: script/source-setup/npm
144
+ - name: Run tests
145
+ run: script/test npm
146
+
147
+ gradle:
148
+ runs-on: ubuntu-latest
149
+ steps:
150
+ - uses: actions/checkout@master
151
+ - name: Set up Ruby
152
+ uses: actions/setup-ruby@v1
153
+ with:
154
+ version: 2.6.x
155
+ - name: Bootstrap
156
+ run: script/bootstrap
157
+ - name: Gradle version
158
+ run: test/fixtures/gradle/gradlew --quiet --version
159
+ - name: Run tests
160
+ run: script/test gradle
161
+
162
+ pip:
163
+ runs-on: ubuntu-latest
164
+ strategy:
165
+ matrix:
166
+ python: [ '2.x', '3.x' ]
167
+ steps:
168
+ - uses: actions/checkout@master
169
+ - name: Setup python
170
+ uses: actions/setup-python@v1
171
+ with:
172
+ python-version: ${{ matrix.python }}
173
+ architecture: x64
174
+ - name: Set up Ruby
175
+ uses: actions/setup-ruby@v1
176
+ with:
177
+ version: 2.6.x
178
+ - name: Bootstrap
179
+ run: script/bootstrap
180
+ - name: Install virtualenv
181
+ run: pip install virtualenv
182
+ - name: Set up fixtures
183
+ run: script/source-setup/pip
184
+ - name: Run tests
185
+ run: script/test pip
186
+
187
+ pipenv:
188
+ runs-on: ubuntu-latest
189
+ steps:
190
+ - uses: actions/checkout@master
191
+ - name: Setup python
192
+ uses: actions/setup-python@v1
193
+ with:
194
+ python-version: '3.x'
195
+ architecture: x64
196
+ - name: Set up Ruby
197
+ uses: actions/setup-ruby@v1
198
+ with:
199
+ version: 2.6.x
200
+ - name: Bootstrap
201
+ run: script/bootstrap
202
+ - name: Install pipenv
203
+ run: pip install pipenv
204
+ - name: Set up fixtures
205
+ run: script/source-setup/pipenv
206
+ - name: Run tests
207
+ run: script/test pipenv
data/.travis.yml CHANGED
@@ -8,6 +8,12 @@ matrix:
8
8
  script: bundle exec rake rubocop build
9
9
  env: NAME="Lint and Build"
10
10
 
11
+ # non-source tests
12
+ - language: ruby
13
+ rvm: 2.4.0
14
+ script: ./script/test core
15
+ env: NAME="Core"
16
+
11
17
  # go 1.7 tests
12
18
  - language: go
13
19
  go: "1.7.x"
data/CHANGELOG.md CHANGED
@@ -6,18 +6,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
- ## 2.3.1 - 2019-08-20
9
+ ## 2.3.2
10
+ 2019-08-26
11
+
12
+ ### Fixed
13
+ - Bundler with/without array settings are properly handled for bundler 1.15.x
14
+
15
+ ## 2.3.1
16
+ 2019-08-20
10
17
 
11
18
  ### Changed
12
19
  - Using the npm source with yarn, "missing" dependencies are no longer considered errors (:tada: @krzysztof-pawlik-gat https://github.com/github/licensed/pull/170)
13
20
  - The bundler source now calls `gem specification` with dependency version requirements (https://github.com/github/licensed/pull/173)
14
21
 
15
- ## 2.3.0 - 2019-05-19
22
+ ## 2.3.0
23
+ 2019-05-19
16
24
 
17
25
  ### Added
18
26
  - New Pipenv dependency source enumerator (:tada: @krzysztof-pawlik-gat https://github.com/github/licensed/pull/167)
19
27
 
20
- ## 2.2.0 - 2019-05-11
28
+ ## 2.2.0
29
+ 2019-05-11
21
30
 
22
31
  ### Added
23
32
  - Content hash versioning strategy for go and manifest sources (https://github.com/github/licensed/pull/164)
@@ -25,7 +34,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
25
34
  ### Fixed
26
35
  - Python source handles urls and package names with "-" in requirements.txt (:tada: @krzysztof-pawlik-gat https://github.com/github/licensed/pull/165)
27
36
 
28
- ## 2.1.0 - 2019-04-16
37
+ ## 2.1.0
38
+ 2019-04-16
29
39
 
30
40
  ### Added
31
41
  - New Gradle dependency source enumerator (:tada: @dbussink https://github.com/github/licensed/pull/150, @jandersson-svt https://github.com/github/licensed/pull/159)
@@ -39,14 +49,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
39
49
  - Migrating to v2 will no longer crash trying to migrate cached records that don't exist (https://github.com/github/licensed/pull/148)
40
50
  - Reported warnings will no longer crash licensed when caching records (https://github.com/github/licensed/pull/147)
41
51
 
42
- ## 2.0.1 - 2019-02-14
52
+ ## 2.0.1
53
+ 2019-02-14
43
54
 
44
55
  ### Changes
45
56
  - Dependency paths that don't exist on the local disk are reported as warnings
46
57
  - Cache, status and list output is sorted by app name, source type and dependency name
47
58
  - Bumped `licensee` gem requirement
48
59
 
49
- ## 2.0.0 - 2019-02-09
60
+ ## 2.0.0
61
+ 2019-02-09
50
62
 
51
63
  **This is a major release and includes breaking changes to the configuration and cached record file formats**
52
64
 
@@ -67,7 +79,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
67
79
  - Licensed no longer exits on errors when evaluating dependency sources or finding dependencies
68
80
  - The Bundler dependency source correctly finds the `bundler` gem as a dependency in more cases
69
81
 
70
- ## 1.5.2 - 2018-12-27
82
+ ## 1.5.2
83
+ 2018-12-27
71
84
 
72
85
  ### Changes
73
86
  - Go source added support for Go modules and Golang 1.11+ (https://github.com/github/licensed/pull/113)
@@ -75,12 +88,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
75
88
  ### Fixed
76
89
  - Licensed will have a non-zero exit code when commands fail (:tada: @parkr https://github.com/github/licensed/pull/111)
77
90
 
78
- ## 1.5.1 - 2018-10-30
91
+ ## 1.5.1
92
+ 2018-10-30
79
93
 
80
94
  ### Fixed
81
95
  - Fixed a scenario where licensed wasn't finding bundler dependencies when run as an executable due to a ruby version mismatch (https://github.com/github/licensed/pull/106)
82
96
 
83
- ## 1.5.0 - 2018-10-24
97
+ ## 1.5.0
98
+ 2018-10-24
99
+
84
100
  ### Added
85
101
  - `licensed (version | -v | --version)` command to see the current licensed version (:tada: @mwagz! https://github.com/github/licensed/pull/101)
86
102
 
@@ -89,7 +105,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
89
105
  - Checking for a Git repo will no longer possibly modify `.git/index` (:tada: @dbussink https://github.com/github/licensed/pull/102)
90
106
  - Fixed a scenario where licensed wasn't finding bundler dependencies when run as an executable (https://github.com/github/licensed/pull/103)
91
107
 
92
- ## 1.4.0 - 2018-10-20
108
+ ## 1.4.0
109
+ 2018-10-20
110
+
93
111
  ### Added
94
112
  - Git Submodules dependency source :tada:
95
113
  - Configuration option to explicitly set a root absolute path
@@ -102,24 +120,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
102
120
  - Running Licensed outside of a Git repository no longer raises an error
103
121
  - Packaging scripts will correctly return to the previous branch when the script is finished
104
122
 
105
- ## 1.3.4 - 2018-09-20
123
+ ## 1.3.4
124
+ 2018-09-20
125
+
106
126
  ### Changes
107
127
  - Bundler source will avoid looking for a gemspec file when possible
108
128
 
109
- ## 1.3.3 - 2018-09-07
129
+ ## 1.3.3
130
+ 2018-09-07
131
+
110
132
  ### Fixed
111
133
  - Manifest source configuration globs correctly enumerates files from within submodules
112
134
  - The manifest source no longer errors when getting version information from submodules
113
135
 
114
- ## 1.3.2 - 2018-08-15
136
+ ## 1.3.2
137
+ 2018-08-15
138
+
115
139
  ### Fixed
116
140
  - Fixed issue when multiple versions of a cabal package are found
117
141
 
118
- ## 1.3.1 - 2018-08-01
142
+ ## 1.3.1
143
+ 2018-08-01
144
+
119
145
  ### Fixed
120
146
  - Fixed regression finding ruby gems by path
121
147
 
122
- ## 1.3.0 - 2018-07-25
148
+ ## 1.3.0
149
+ 2018-07-25
150
+
123
151
  ### Added
124
152
  - Manifests for the manifest dependency source can be specified using glob patterns in the configuration
125
153
  - Paths to licenses for dependencies from the manifest dependency source can be specified in the configuration
@@ -134,7 +162,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
134
162
  ### Fixed
135
163
  - Fixed regression finding platform-specific ruby gems
136
164
 
137
- ## 1.2.0 - 2018-06-22
165
+ ## 1.2.0
166
+ 2018-06-22
167
+
138
168
  ### Added
139
169
  - Building and packaging distributable exes for licensed releases
140
170
  - Can now configure which Gemfile groups are excluded from dependency enumeration
@@ -143,7 +173,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
143
173
  - Bundler is no longer always reported as a dependency
144
174
  - Set the minimum required ruby version for licensed
145
175
 
146
- ## 1.1.0 - 2018-06-04
176
+ ## 1.1.0
177
+ 2018-06-04
178
+
147
179
  ### Added
148
180
  - Pip dependency source :tada:
149
181
  - Go Dep dependency source :tada:
@@ -158,7 +190,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
158
190
  - Vendored packages from the go std library are properly excluded
159
191
  - Cabal dependency enumeration properly includes executable targets
160
192
 
161
- ## 1.0.1 - 2018-04-26
193
+ ## 1.0.1
194
+ 2018-04-26
195
+
162
196
  ### Added
163
197
  - GOPATH settable in configuration file
164
198
 
@@ -169,8 +203,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
169
203
  - Path expansion for cabal "ghc_package_db" configuration setting occurs from repository root
170
204
  - Local Gemfile(.lock) files correctly used in enumerating Bundler source dependencies
171
205
 
172
- ## 1.0.0 - 2018-02-20
206
+ ## 1.0.0
207
+ 2018-02-20
173
208
 
174
209
  Initial release :tada:
175
210
 
176
- [Unreleased]: https://github.com/github/licensed/compare/2.3.1...HEAD
211
+ [Unreleased]: https://github.com/github/licensed/compare/2.3.2...HEAD
data/CONTRIBUTING.md CHANGED
@@ -52,6 +52,10 @@ If you are the current maintainer of this gem:
52
52
  3. Test behavior locally, branch deploy, whatever needs to happen
53
53
  9. Merge github/licensed PR
54
54
  10. Tag and push: `git tag x.xx.xx; git push --tags`
55
+
56
+ The following steps will happen automatically from a GitHub Actions workflow
57
+ after pushing a new tag. In case that fails, the following steps can be performed manually
58
+
55
59
  11. Push to rubygems.org -- `gem push licensed-x.xx.xx.gem`
56
60
  12. Build packages for new tag: `VERSION=x.xx.xx bundle exec rake package`
57
61
  13. Create release for new tag at github/licensed.
data/Rakefile CHANGED
@@ -47,6 +47,20 @@ namespace :test do
47
47
  t.test_files = FileList["test/commands/*_test.rb", "test/sources/#{source}_test.rb"]
48
48
  end
49
49
  end
50
+
51
+ namespace :core do
52
+ task :env do
53
+ ENV["SOURCE"] = ""
54
+ end
55
+ end
56
+
57
+ Rake::TestTask.new(core: "test:core:env") do |t|
58
+ t.description = "Run non-source tests"
59
+ t.libs << "test"
60
+ t.libs << "lib"
61
+ t.test_files = FileList["test/**/*_test.rb"].exclude("test/fixtures/**/*_test.rb")
62
+ .exclude("test/sources/*_test.rb")
63
+ end
50
64
  end
51
65
 
52
66
  Rake::TestTask.new(:test) do |t|
@@ -4,7 +4,7 @@ RUN apt-get update \
4
4
  && apt-get install -y --no-install-recommends cmake make gcc pkg-config squashfs-tools git curl bison rsync \
5
5
  && rm -rf /var/lib/apt/lists/*
6
6
 
7
- RUN curl -L http://enclose.io/rubyc/rubyc-linux-x64.gz | gunzip > /usr/local/bin/rubyc \
7
+ RUN curl -L https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-linux-amd64.gz | gunzip > /usr/local/bin/rubyc \
8
8
  && chmod +x /usr/local/bin/rubyc
9
9
 
10
10
  RUN gem update --system && gem update bundler
@@ -247,7 +247,16 @@ module Licensed
247
247
  # Returns the bundle definition groups, removing "without" groups,
248
248
  # and including "with" groups
249
249
  def groups
250
- definition.groups - Array(::Bundler.settings[:without]) + Array(::Bundler.settings[:with]) - exclude_groups
250
+ @groups ||= definition.groups - bundler_setting_array(:without) + bundler_setting_array(:with) - exclude_groups
251
+ end
252
+
253
+ # Returns a bundler setting as an array.
254
+ # Depending on the version of bundler, array values are either returned as
255
+ # a raw string ("a:b:c") or as an array ([:a, :b, :c])
256
+ def bundler_setting_array(key)
257
+ setting = ::Bundler.settings[key]
258
+ setting = setting.split(":").map(&:to_sym) if setting.is_a?(String)
259
+ Array(setting)
251
260
  end
252
261
 
253
262
  # Returns any groups to exclude specified from both licensed configuration
@@ -131,8 +131,7 @@ module Licensed
131
131
  # Returns an array of ghc package DB locations as specified in the app
132
132
  # configuration
133
133
  def package_db_args
134
- return [] unless @config["cabal"]
135
- Array(@config["cabal"]["ghc_package_db"]).map do |path|
134
+ @package_db_args ||= Array(@config.dig("cabal", "ghc_package_db")).map do |path|
136
135
  next "--#{path}" if %w(global user).include?(path)
137
136
  path = realized_ghc_package_path(path)
138
137
  path = File.expand_path(path, @config.root)
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
  module Licensed
3
- VERSION = "2.3.1".freeze
3
+ VERSION = "2.3.2".freeze
4
4
 
5
5
  def self.previous_major_versions
6
6
  major_version = Gem::Version.new(Licensed::VERSION).segments.first
@@ -31,13 +31,13 @@ build_linux_docker() {
31
31
  }
32
32
 
33
33
  build_linux_local() {
34
- sudo apt-get update && \
35
- apt-get install -y --no-install-recommends cmake make gcc pkg-config squashfs-tools curl bison git
34
+ sudo apt-get update
35
+ sudo apt-get install -y --no-install-recommends cmake make gcc pkg-config squashfs-tools curl bison git rsync
36
36
 
37
37
  RUBYC="$BASE_DIR/bin/rubyc-linux"
38
38
  if [ ! -f "$RUBYC" ]; then
39
39
  mkdir -p "$(dirname "$RUBYC")"
40
- curl -L http://enclose.io/rubyc/rubyc-linux-x64.gz | gunzip > "$RUBYC"
40
+ curl -L https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-linux-amd64.gz | gunzip > "$RUBYC"
41
41
  chmod +x "$RUBYC"
42
42
  fi
43
43
 
data/script/packages/mac CHANGED
@@ -26,10 +26,11 @@ RUBYC="$BASE_DIR/bin/rubyc-darwin"
26
26
 
27
27
  brew update
28
28
  brew list "squashfs" &>/dev/null || brew install "squashfs"
29
+ brew list "pkg-config" &>/dev/null || brew install "pkg-config"
29
30
 
30
31
  if [ ! -f "$RUBYC" ]; then
31
32
  mkdir -p "$(dirname "$RUBYC")"
32
- curl -L http://enclose.io/rubyc/rubyc-darwin-x64.gz | gunzip > "$RUBYC"
33
+ curl -L https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-osx-amd64.gz | gunzip > "$RUBYC"
33
34
  chmod +x "$RUBYC"
34
35
  fi
35
36
 
@@ -14,4 +14,5 @@ if [ "$1" == "-f" ]; then
14
14
  find . -not -regex "\.*" -and -not -path "*app*" -print0 | xargs -0 rm -rf
15
15
  fi
16
16
 
17
+ cabal update
17
18
  cabal new-build
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: licensed
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - GitHub
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-08-21 00:00:00.000000000 Z
11
+ date: 2019-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: licensee
@@ -192,6 +192,8 @@ executables:
192
192
  extensions: []
193
193
  extra_rdoc_files: []
194
194
  files:
195
+ - ".github/workflows/release.yml"
196
+ - ".github/workflows/test.yml"
195
197
  - ".gitignore"
196
198
  - ".licensed.yml"
197
199
  - ".rubocop.yml"