Skip to content

Commit 6ec8953

Browse files
committed
bosh-stemcell: introduce Gemfile, move deps to gemspec
- add Rakefile for gem - update testing to use `rake spec` - dev dependency gems are removed from cache
1 parent 6f0a721 commit 6ec8953

20 files changed

Lines changed: 32 additions & 81 deletions

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
- name: test-bosh-stemcell
1212
run: |
1313
bundle install
14-
bundle exec rspec
14+
bundle exec rake
1515
working-directory: bosh-stemcell/

Gemfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
source 'https://rubygems.org'
22

3-
group :development, :test do
4-
gem 'bosh-stemcell', path: 'bosh-stemcell'
5-
gem 'fakefs'
6-
gem 'logging'
7-
gem 'rake'
8-
gem 'rspec'
9-
gem 'rspec-instafail'
10-
gem 'rspec-its'
11-
gem 'timecop'
12-
end
3+
gem 'rake'
4+
gem 'bosh-stemcell', path: 'bosh-stemcell'

Gemfile.lock

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,24 @@ PATH
22
remote: bosh-stemcell
33
specs:
44
bosh-stemcell (0.0.0)
5+
logging
56

67
GEM
78
remote: https://rubygems.org/
89
specs:
9-
diff-lcs (1.6.2)
10-
fakefs (3.2.1)
1110
little-plugger (1.1.4)
1211
logging (2.4.0)
1312
little-plugger (~> 1.1)
1413
multi_json (~> 1.14)
15-
multi_json (1.19.1)
14+
multi_json (1.20.0)
1615
rake (13.3.1)
17-
rspec (3.13.2)
18-
rspec-core (~> 3.13.0)
19-
rspec-expectations (~> 3.13.0)
20-
rspec-mocks (~> 3.13.0)
21-
rspec-core (3.13.6)
22-
rspec-support (~> 3.13.0)
23-
rspec-expectations (3.13.5)
24-
diff-lcs (>= 1.2.0, < 2.0)
25-
rspec-support (~> 3.13.0)
26-
rspec-instafail (1.0.0)
27-
rspec
28-
rspec-its (2.0.0)
29-
rspec-core (>= 3.13.0)
30-
rspec-expectations (>= 3.13.0)
31-
rspec-mocks (3.13.8)
32-
diff-lcs (>= 1.2.0, < 2.0)
33-
rspec-support (~> 3.13.0)
34-
rspec-support (3.13.7)
35-
timecop (0.9.10)
3616

3717
PLATFORMS
3818
ruby
3919

4020
DEPENDENCIES
4121
bosh-stemcell!
42-
fakefs
43-
logging
4422
rake
45-
rspec
46-
rspec-instafail
47-
rspec-its
48-
timecop
4923

5024
BUNDLED WITH
5125
2.5.23

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ OSX=true OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec spec/ --
188188
The BOSH Linux Stemcell Builder code itself can be tested with the following command's:
189189

190190
```shell
191-
bundle install --local
191+
bundle install
192192
cd /opt/bosh/bosh-stemcell
193-
bundle exec rspec spec/
193+
bundle exec rake
194194
```
195195

196196
## Troubleshooting

bosh-stemcell/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec

bosh-stemcell/Rakefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
require "rspec/core/rake_task"
2+
3+
task default: [:spec]
4+
5+
RSpec::Core::RakeTask.new(:spec)

bosh-stemcell/bosh-stemcell.gemspec

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,14 @@ Gem::Specification.new do |spec|
1919
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
2020
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
2121
spec.require_paths = %w[lib]
22+
23+
spec.add_dependency 'logging'
24+
25+
spec.add_development_dependency 'fakefs'
26+
spec.add_development_dependency 'rake'
27+
spec.add_development_dependency 'rspec'
28+
spec.add_development_dependency 'rspec-instafail'
29+
spec.add_development_dependency 'rspec-its'
30+
spec.add_development_dependency 'standard'
31+
spec.add_development_dependency 'timecop'
2232
end

ci/tasks/test-unit.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ fi
1313
# we need sudo for our chroot operations in the shellout_types tests
1414
apt install sudo
1515

16-
pushd "${REPO_PARENT}/bosh-linux-stemcell-builder"
17-
bundle install --local
18-
19-
pushd bosh-stemcell
20-
bundle exec rspec spec/
21-
OS_IMAGE="$(readlink -f ../../os-image-tarball/*.tgz)" bundle exec rspec spec/ --tag shellout_types
22-
popd
16+
pushd "${REPO_PARENT}/bosh-linux-stemcell-builder/bosh-stemcell"
17+
bundle install
18+
bundle exec rake
19+
OS_IMAGE="$(readlink -f "${REPO_PARENT}"/os-image-tarball/*.tgz)" bundle exec rspec spec/ --tag shellout_types
2320
popd

vendor/cache/diff-lcs-1.6.2.gem

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/cache/fakefs-3.2.1.gem

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)