Skip to content
This repository was archived by the owner on Jan 30, 2024. It is now read-only.

Commit a90ea0f

Browse files
committed
Merge branch 'release/v2.0.0'
* release/v2.0.0: bumped version file and CHANGELOG updated dependencies pin RuboCop to v0.46.0 minor refactoring to reduce block length added changelog updated dependency to Bundler ~> 1.13.0 added dkdeploy logo added inch.ci badge set proper project name in README
2 parents a53c51a + e5f38e4 commit a90ea0f

File tree

7 files changed

+39
-18
lines changed

7 files changed

+39
-18
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
This project adheres to [Semantic Versioning](http://semver.org/).
4+
5+
## [Unreleased]
6+
7+
## [2.0.0] - 2017-04-05
8+
### Summary
9+
- Bundler, Capistrano updates
10+
- moved dependencies to development dependencies
11+
12+
13+
## [1.0.0] - 2016-06-20
14+
### Summary
15+
16+
- first public release
17+
18+
[Unreleased]: https://github.com/dkdeploy/dkdeploy-test_environment/compare/master...develop
19+
[2.0.0]: https://github.com/dkdeploy/dkdeploy-test_environment/releases/tag/v2.0.0
20+
[1.0.0]: https://github.com/dkdeploy/dkdeploy-test_environment/releases/tag/v1.0.0

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2016 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
1+
Copyright (c) 2014-2017 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# Dkdeploy::Test
1+
![dkdeploy::core](assets/dkdeploy-logo.png)
22

3-
[![Gem Version](https://badge.fury.io/rb/dkdeploy-test_environment.svg)](https://badge.fury.io/rb/dkdeploy-test_environment)
3+
# Dkdeploy::TestEnvironment
4+
5+
[![Gem Version](https://badge.fury.io/rb/dkdeploy-test_environment.svg)](https://badge.fury.io/rb/dkdeploy-test_environment) [![Inline docs](http://inch-ci.org/github/dkdeploy/dkdeploy-core.svg?branch=develop)](http://inch-ci.org/github/dkdeploy/dkdeploy-core)
46

57
## Description
68

assets/dkdeploy-logo.png

11.2 KB
Loading

dkdeploy-test_enviroment.gemspec

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# coding: utf-8
2+
23
lib = File.expand_path('../lib', __FILE__)
34
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
45
require 'dkdeploy/test_environment/version'
@@ -12,19 +13,21 @@ Gem::Specification.new do |spec|
1213
spec.description = 'test infrastructure for dkdeploy'
1314
spec.summary = 'dkdeploy-test_environment provides a test application for dkdeploy'
1415
spec.homepage = 'https://github.com/dkdeploy/dkdeploy-test_environment'
16+
spec.required_ruby_version = '~> 2.2'
1517

1618
spec.files = `git ls-files`.split($/)
1719
spec.executables = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
1820
spec.test_files = spec.files.grep(%r{^(test|spec|features)\/})
1921
spec.require_paths = ['lib']
2022

21-
spec.add_dependency 'bundler', '~> 1.12.5'
22-
spec.add_dependency 'rake', '~> 11.2'
23-
spec.add_dependency 'rspec', '~> 3.4'
24-
spec.add_dependency 'cucumber', '~> 2.3'
25-
spec.add_dependency 'rubocop', '~> 0.40'
26-
spec.add_dependency 'aruba', '~> 0.14'
27-
spec.add_dependency 'mysql2', '~> 0.3.21'
28-
spec.add_dependency 'pry', '~> 0.10.1'
29-
spec.add_dependency 'sshkit', '~> 1.10.0'
23+
spec.add_dependency 'bundler'
24+
spec.add_dependency 'rake'
25+
26+
spec.add_development_dependency 'aruba', '~> 0.14'
27+
spec.add_development_dependency 'mysql2', '~> 0.3'
28+
spec.add_development_dependency 'pry', '~> 0.10.3'
29+
spec.add_development_dependency 'cucumber', '~> 2.4'
30+
spec.add_development_dependency 'rspec', '~> 3.5'
31+
spec.add_development_dependency 'rubocop', '~> 0.48.1'
32+
spec.add_development_dependency 'sshkit', '~> 1.13'
3033
end

lib/dkdeploy/test_environment/step_definitions/remote_commands.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@
127127
raise ArgumentError, 'The given permissions can not be mapped'
128128
end
129129

130-
if should_or_not == 'should'
131-
expect(decision).to be true
132-
else
133-
expect(decision).to be false
134-
end
130+
expect(decision).to be(should_or_not == 'should')
135131
end
136132

137133
When(/^I store the symlink source of current$/) do

lib/dkdeploy/test_environment/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module TestEnvironment
33
# Class for version number
44
#
55
class Version
6-
MAJOR = 1
6+
MAJOR = 2
77
MINOR = 0
88
PATCH = 0
99

0 commit comments

Comments
 (0)