yes_ship_it 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 386f935bfc176acc42ce8db6dbd265ee71cd2755
-  data.tar.gz: d9c5db583f23cf9dbef738c0240ff1e75cedf67d
+SHA256:
+  metadata.gz: be8b01a1d9a12d083bd94de3b302a6f2a21fb67747ee79913b435dafb32f47e1
+  data.tar.gz: d55a649008a05966837fc3d7d070ac7fec0fa631615711b53fed0c97b3b8d789
 SHA512:
-  metadata.gz: 9dfc18b1ee1062e65dd9ba975cf8343dd16d07d56f4f00d4a37db446fa3bc39d8f5fa95bb1a1be573d83974ae17401232dbe43cfaeba4756f13cc07ec7e10002
-  data.tar.gz: 856b65c05ae1a909705be57c700594dfa6f67162f50ef6348653582327d57ada1dbdf96188e639acd407b5047cf26cf0d6224a72aba580e2b04688376aa38ab6
+  metadata.gz: 5dd3d86ef3169db543b724088af7ec2e9cf804737dc858cfac3c30eb50b8264ddd48eb166f641b49cce62db56f62068db82da676c6f0b306d74b0913c3cb8fc0
+  data.tar.gz: 860e1901d6fbc0c47dd79c4c2cee50cadff9834c6fef7afe5985455de99213cac38aa0105ad8b909a985f8eae2b0d5eb0989ad9930d17c94afee412980dda4e0

data/.github/workflows/ruby.yml

@@ -0,0 +1,23 @@
+name: Ruby CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0.1, 2.7.3, 2.6.7]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rspec spec/unit

data/.ruby-version

@@ -0,0 +1 @@
+2.7.3

data/assertions/release_branch.rb

@@ -1,13 +1,11 @@
 module YSI
   class ReleaseBranch < Assertion
+    parameter :branch, "master"
+
     def self.display_name
       "release branch"
     end
 
-    def branch
-      "master"
-    end
-
     def current_branch
       git_branch.each_line do |line|
         if line =~ /\* (.*)/

data/lib/version.rb

@@ -1,3 +1,3 @@
 module YSI
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/integration/cli_spec.rb

@@ -407,7 +407,7 @@ EOT
           end
         end
 
-        plugin_path = File.join(dir, "yes_ship_it", "assertions", "my_plugin.rb")
+        plugin_path = File.join(path_prefix, dir, "yes_ship_it", "assertions", "my_plugin.rb")
 
         expected_output = <<EOT
 Can't generate plugin. Plugin already exists at `#{plugin_path}`.
@@ -418,7 +418,7 @@ EOT
 
       it "creates new plugin" do
         dir = given_directory
-        plugin_path = File.join(dir, "yes_ship_it", "assertions", "my_plugin.rb")
+        plugin_path = File.join(path_prefix, dir, "yes_ship_it", "assertions", "my_plugin.rb")
 
         expected_output = <<EOT
 Generated assertion plugin at `#{plugin_path}`.

data/spec/spec_helper.rb

@@ -9,3 +9,7 @@ def setup_test_git_repo(version, dir)
     raise "Unable to extract tarball #{tarball}"
   end
 end
+
+def path_prefix
+  /darwin/ =~ RUBY_PLATFORM ? '/private' : ''
+end

data/spec/system/dry_run_spec.rb

@@ -29,7 +29,7 @@ describe "dry run" do
     checkout_tar = File.expand_path("../data/red_herring-checkout-dry-run.tar.gz", __FILE__)
     @client.inject_tarball(checkout_tar)
 
-    @client.execute(["yes_ship_it.ruby2.1", "--dry-run"], working_directory: "red_herring")
+    @client.execute(["yes_ship_it.ruby2.5", "--dry-run"], working_directory: "red_herring")
 
     expected_output = <<EOT
 Shipping...

data/spec/system/rpm_spec.rb

@@ -29,7 +29,7 @@ describe "rpm" do
     checkout_tar = File.expand_path("../data/red_herring-checkout-rpm.tar.gz", __FILE__)
     @client.inject_tarball(checkout_tar)
 
-    @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+    @client.execute(["yes_ship_it.ruby2.5"], working_directory: "red_herring")
 
     expected_output = <<EOT
 Shipping...

data/spec/system/ruby_gem_spec.rb

@@ -30,7 +30,7 @@ describe "ship ruby gem" do
       checkout_tar = File.expand_path("../data/red_herring-checkout-build.tar.gz", __FILE__)
       @client.inject_tarball(checkout_tar)
 
-      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.5"], working_directory: "red_herring")
 
       expect(@client.exit_code).to eq(0)
 
@@ -55,7 +55,7 @@ EOT
       checkout_tar = File.expand_path("../data/red_herring-checkout-push.tar.gz", __FILE__)
       @client.inject_tarball(checkout_tar)
 
-      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.5"], working_directory: "red_herring")
 
       expect(@client.exit_code).to eq(0)
 
@@ -83,7 +83,7 @@ EOT
       checkout_tar = File.expand_path("../data/red_herring-checkout-not-push.tar.gz", __FILE__)
       @client.inject_tarball(checkout_tar)
 
-      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.5"], working_directory: "red_herring")
 
       expect(@client.exit_code).to eq(0)
 
@@ -115,7 +115,7 @@ EOT
     end
 
     it "tells how to login" do
-      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.5"], working_directory: "red_herring")
 
       expected_output = <<EOT
 Shipping...

data/spec/unit/assertion_spec.rb

@@ -24,34 +24,36 @@ describe YSI::Assertion do
   end
 
   describe "parameters" do
-    class MyAssertion < YSI::Assertion
-      parameter :some_thing
-      parameter :some_other_thing, "default_hello"
+    module YSI
+      class MyAssertion < Assertion
+        parameter :some_thing
+        parameter :some_other_thing, "default_hello"
 
-      def self.display_name
-        "My Assertion"
-      end
+        def self.display_name
+          "My Assertion"
+        end
 
-      def check
-      end
+        def check
+        end
 
-      def assert
+        def assert
+        end
       end
     end
 
     it "has methods for parameter" do
-      my = MyAssertion.new(YSI::Engine.new)
+      my = YSI::MyAssertion.new(YSI::Engine.new)
       my.some_thing = "hello"
       expect(my.some_thing).to eq("hello")
     end
 
     it "has default value for parameter" do
-      my = MyAssertion.new(YSI::Engine.new)
+      my = YSI::MyAssertion.new(YSI::Engine.new)
       expect(my.some_other_thing).to eq("default_hello")
     end
 
     it "returns nil when parameter is not set" do
-      my = MyAssertion.new(YSI::Engine.new)
+      my = YSI::MyAssertion.new(YSI::Engine.new)
       expect(my.some_thing).to be(nil)
     end
 

data/spec/unit/assertions/release_branch_spec.rb

@@ -2,7 +2,7 @@ require_relative "../spec_helper.rb"
 
 describe YSI::ReleaseBranch do
   describe "#current_branch" do
-    it "finds current non-master branch" do
+    it "finds current non-release branch" do
       a = YSI::ReleaseBranch.new(YSI::Engine)
 
       allow(a).to receive(:git_branch).and_return("  master\n* otherone\n")
@@ -10,7 +10,7 @@ describe YSI::ReleaseBranch do
       expect(a.current_branch).to eq("otherone")
     end
 
-    it "finds current master branch" do
+    it "finds current release branch" do
       a = YSI::ReleaseBranch.new(YSI::Engine)
 
       allow(a).to receive(:git_branch).and_return("* master\n otherone\n")
@@ -18,12 +18,26 @@ describe YSI::ReleaseBranch do
       expect(a.current_branch).to eq("master")
     end
 
-    it "finds current master branch if it's the only branch" do
+    it "finds current release branch if it's the only branch" do
       a = YSI::ReleaseBranch.new(YSI::Engine)
 
       allow(a).to receive(:git_branch).and_return("* master\n")
 
       expect(a.current_branch).to eq("master")
     end
+
+    it "reads branch parameter" do
+      config = <<~YAML
+        assertions:
+          release_branch:
+            branch: main
+          version:
+            version_file: lib/version.rb
+      YAML
+      engine = YSI::Engine.new
+      engine.read_config(config)
+
+      expect(engine.assertions.first.branch).to eq("main")
+    end
   end
 end

data/spec/unit/assertions/yes_it_shipped_spec.rb

@@ -17,7 +17,7 @@ describe YSI::YesItShipped do
 }
 EOT
       stub_request(:get, "https://yes-it-shipped.herokuapp.com/releases/dummy/1.0.0").
-         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip, deflate', 'Host'=>'yes-it-shipped.herokuapp.com'}).
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>/.*/, 'Host'=>'yes-it-shipped.herokuapp.com', 'User-Agent'=>/.*/}).
          to_return(:status => 200, :body => body, :headers => {})
 
       engine = YSI::Engine.new
@@ -29,7 +29,7 @@ EOT
 
     it "fails when release is not there" do
       stub_request(:get, "https://yes-it-shipped.herokuapp.com/releases/dummy/2.0.0").
-         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip, deflate', 'Host'=>'yes-it-shipped.herokuapp.com'}).
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>/.*/, 'Host'=>'yes-it-shipped.herokuapp.com', 'User-Agent'=>/.*/}).
          to_return(:status => 404, :body => "", :headers => {})
 
       engine = YSI::Engine.new
@@ -54,10 +54,11 @@ EOT
           },
           :headers => {
             'Accept'=>'*/*',
-            'Accept-Encoding'=>'gzip, deflate',
+            'Accept-Encoding'=> /.*/,
             'Content-Length'=>'334',
             'Content-Type'=>'application/x-www-form-urlencoded',
-            'Host'=>'yes-it-shipped.herokuapp.com'
+            'Host'=>'yes-it-shipped.herokuapp.com',
+            'User-Agent' => /.*/
           }).to_return(:status => 200, :body => "", :headers => {})
 
       engine = YSI::Engine.new

data/spec/unit/executor_spec.rb

@@ -6,7 +6,7 @@ describe YSI::Executor do
   describe "working directory" do
     it "runs in the given working directory" do
       working_directory = subject.run_command(["pwd"], working_directory: "/tmp")
-      expect(working_directory).to eq("/tmp\n")
+      expect(working_directory).to eq(File.join(path_prefix, "/tmp\n")) 
     end
 
     it "sets back the working directory to the original value" do

data/yes_ship_it.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "cli_tester", ">= 0.0.2"
   s.add_development_dependency "httpotemkin"
   s.add_development_dependency "webmock", "~> 2.1"
+  s.add_development_dependency "byebug"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yes_ship_it
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Whenever the answer is 'Yes, ship it!' you will need yes_ship_it. It
   is the ultimate helper in releasing software..
 email:
@@ -132,9 +146,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -242,8 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: yes_ship_it
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The ultimate release script

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
- - "2.1.2"
- - "2.1.8"
- - "2.2.4"
- - "2.3.0"
-script: bundle exec rspec spec/unit