yes_ship_it 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78b481295a4a4a9ba607adb08eec58bac7f207a0
-  data.tar.gz: c8b0e1378e39c261db0c58c6858bfbf7c9cca3fd
+SHA256:
+  metadata.gz: be8b01a1d9a12d083bd94de3b302a6f2a21fb67747ee79913b435dafb32f47e1
+  data.tar.gz: d55a649008a05966837fc3d7d070ac7fec0fa631615711b53fed0c97b3b8d789
 SHA512:
-  metadata.gz: 51adeca1f94982d83fe0f7f089b1e40630da8d7da5324a2907edf1cda869fc40b63abbee3f1bdf77be9710c8a9b08380d186c958347898d6691af094f69c4d02
-  data.tar.gz: c6e49865aa4a412d8677326febf8ed07361b921569b04566a57fbd22d28cec6b511b0cbe43f8fcc2f1d7872b7efa71b03641e9ad58b3c35e0486dd581edfa6fe
+  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/.gitignore

@@ -1,3 +1,5 @@
 Gemfile.lock
 *.gem
 tmp
+*.swp
+.vscode

data/.ruby-version

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

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change log of yes_ship_it
 
+## Version 0.2.1
+
+* Make working tree check work with git 2.12
+
+## Version 0.2.0
+
+* Make URL of YesItShipped server where updates are posted configurable
+
+## Version 0.1.2
+
+* Parse time zone of tag date also in the case when it's different from local
+  time zone
+
+## Version 0.1.1
+
+* Fix failure in `yes_it_shipped` assertion when parsing tag date
+
 ## Version 0.1.0
 
 yes_ship_it has reached a useful state, so it's going to a version scheme which

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/assertions/tag.rb

@@ -10,14 +10,21 @@ module YSI
       @engine.tag
     end
 
+    def get_tag_date(executor)
+      output = executor.run_command(["git", "show", tag])
+      if output
+        output.each_line do |show_line|
+          if show_line =~ /Date:\s+(.*)/
+            @engine.tag_date = Time.strptime($1,"%a %b %d %H:%M:%S %Y %z")
+          end
+        end
+      end
+    end
+
     def check
       Executor.new.run_command(["git", "tag"]).each_line do |line|
         if line.chomp == tag
-          Executor.new.run_command(["git", "show", tag]).each_line do |show_line|
-            if show_line =~ /Date:\s+(.*)/
-              @engine.tag_date = $1
-            end
-          end
+          get_tag_date(YSI::Executor.new)
           return tag
         end
       end
@@ -26,6 +33,7 @@ module YSI
 
     def assert(executor)
       executor.run_command(["git", "tag", "-a", tag, "-m", engine.version])
+      get_tag_date(executor)
       tag
     end
   end

data/assertions/working_directory.rb

@@ -13,6 +13,8 @@ module YSI
         g = git_status
         if g =~ /working directory clean/
           @status = "clean"
+        elsif g =~ /working tree clean/
+          @status = "clean"
         elsif g =~ /Changes to be committed/
           @status = "uncommitted changes"
         elsif g =~ /Untracked files/

data/assertions/yes_it_shipped.rb

@@ -6,9 +6,15 @@ module YSI
       "pushed to yes-it-shipped"
     end
 
+    def self.url
+      "https://yes-it-shipped.herokuapp.com"
+    end
+
+    parameter :yis_server_url, YesItShipped.url
+    
     def check
       begin
-        RestClient.get("https://yes-it-shipped.herokuapp.com/releases/#{engine.project_name}/#{engine.version}")
+        RestClient.get("#{yis_server_url}/releases/#{engine.project_name}/#{engine.version}")
         return "#{engine.project_name}-#{engine.version}"
       rescue RestClient::ResourceNotFound
         return nil
@@ -16,9 +22,9 @@ module YSI
     end
 
     def assert(executor)
-      executor.http_post("https://yes-it-shipped.herokuapp.com/releases",
+      executor.http_post("#{yis_server_url}/releases",
         project: engine.project_name, version: engine.version,
-        release_date_time: engine.tag_date.utc, project_url: engine.project_url,
+        release_date_time: engine.tag_date, project_url: engine.project_url,
         release_url: engine.release_url, ysi_config_url: engine.config_url)
       "#{engine.project_name}-#{engine.version}"
     end

data/bin/yes_ship_it

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 require_relative("../lib/yes_ship_it.rb")
 

data/lib/version.rb

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

data/lib/yes_ship_it.rb

@@ -5,6 +5,8 @@ require "inifile"
 require "rexml/document"
 require "erb"
 require "cheetah"
+require "time"
+require "json"
 
 require_relative "yes_ship_it/assertion.rb"
 require_relative "yes_ship_it/engine.rb"

data/lib/yes_ship_it/engine.rb

@@ -2,7 +2,8 @@ module YSI
   class Engine
     attr_reader :assertions
     attr_reader :executor
-    attr_accessor :version, :tag_date, :release_archive
+    attr_writer :tag_date
+    attr_accessor :version, :release_archive
     attr_accessor :out
     attr_accessor :data_dir
 
@@ -96,6 +97,10 @@ module YSI
       "v#{version}"
     end
 
+    def tag_date
+      @tag_date && @tag_date.utc
+    end
+
     def release_archive_file_name
       File.basename(release_archive)
     end

data/lib/yes_ship_it/init.rb

@@ -42,6 +42,11 @@ module YSI
         end
       end
       out.puts
+      out.puts "The generated configuration includes an assertion, which publishes the release on"
+      out.puts "#{YesItShipped.url}, our release notification service. If you"
+      out.puts "prefer to not publish releases there, simply remove the `yes_it_shipped`"
+      out.puts "assertion."
+      out.puts
       out.puts "Check the file `yes_ship_it.conf` and adapt it to your needs."
       out.puts
       out.puts "Happy shipping!"

data/spec/integration/cli_spec.rb

@@ -67,7 +67,7 @@ Checking version number: 0.0.1
 Checking change log: CHANGELOG.md
 Checking tag: v0.0.1
 
-red_herring 0.0.1 already shipped on Wed Jul 1 00:46:19 2015 +0200
+red_herring 0.0.1 already shipped on 2015-06-30 22:46:19 UTC
 EOT
 
       expect(run_command(working_directory: File.join(dir, "red_herring"))).
@@ -300,6 +300,11 @@ Initialized directory for shipping.
 
 Couldn't determine type of project, wrote a generic template.
 
+The generated configuration includes an assertion, which publishes the release on
+https://yes-it-shipped.herokuapp.com, our release notification service. If you
+prefer to not publish releases there, simply remove the `yes_it_shipped`
+assertion.
+
 Check the file `yes_ship_it.conf` and adapt it to your needs.
 
 Happy shipping!
@@ -320,6 +325,11 @@ Initialized directory for shipping.
 
 It looks like this is is Ruby project.
 
+The generated configuration includes an assertion, which publishes the release on
+https://yes-it-shipped.herokuapp.com, our release notification service. If you
+prefer to not publish releases there, simply remove the `yes_it_shipped`
+assertion.
+
 Check the file `yes_ship_it.conf` and adapt it to your needs.
 
 Happy shipping!
@@ -397,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}`.
@@ -408,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/tag_spec.rb

@@ -0,0 +1,49 @@
+require_relative "../spec_helper"
+
+describe YSI::Tag do
+  describe "#get_tag_date" do
+    it "gets tag date" do
+      engine = YSI::Engine.new
+      engine.version = "0.0.2"
+      tag = YSI::Tag.new(engine)
+
+      executor = double
+      expect(executor).to receive(:run_command).with(["git", "show", "v0.0.2"]).
+        and_return("Date:   Tue Jul 14 01:13:16 2015 +0200")
+
+      tag.get_tag_date(executor)
+
+      expect(engine.tag_date).to eq(Time.parse("20150713T231316Z"))
+    end
+  end
+
+  describe "#check" do
+    it "gets an existing tag" do
+      expect_any_instance_of(YSI::Executor).to receive(:run_command).
+        with(["git", "tag"]).and_return("v0.0.1\nv0.0.2\n")
+
+      engine = YSI::Engine.new
+      engine.version = "0.0.2"
+      tag = YSI::Tag.new(engine)
+
+      expect(tag).to receive(:get_tag_date)
+
+      tag.check
+    end
+  end
+
+  describe "#assert" do
+    it "creates a tag" do
+      engine = YSI::Engine.new
+      engine.version = "0.0.2"
+      tag = YSI::Tag.new(engine)
+
+      executor = double
+      expect(executor).to receive(:run_command).
+        with(["git", "tag", "-a", "v0.0.2", "-m", "0.0.2"])
+      expect(tag).to receive(:get_tag_date)
+
+      tag.assert(executor)
+    end
+  end
+end

data/spec/unit/assertions/working_directory_spec.rb

@@ -2,6 +2,21 @@ require_relative "../spec_helper.rb"
 
 describe YSI::WorkingDirectory do
   describe "#status" do
+    context "git 2.12.0" do
+      it "clean" do
+        a = YSI::WorkingDirectory.new(YSI::Engine)
+
+        git_output = <<EOT
+On branch master
+Your branch is up-to-date with 'origin/master'.
+nothing to commit, working tree clean
+EOT
+        allow(a).to receive(:git_status).and_return(git_output)
+
+        expect(a.status).to eq("clean")
+      end
+    end
+
     it "clean" do
       a = YSI::WorkingDirectory.new(YSI::Engine)
 

data/spec/unit/assertions/yes_it_shipped_spec.rb

@@ -17,8 +17,8 @@ describe YSI::YesItShipped do
 }
 EOT
       stub_request(:get, "https://yes-it-shipped.herokuapp.com/releases/dummy/1.0.0").
-        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
-        to_return(:status => 200, :body => body, :headers => {})
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>/.*/, 'Host'=>'yes-it-shipped.herokuapp.com', 'User-Agent'=>/.*/}).
+         to_return(:status => 200, :body => body, :headers => {})
 
       engine = YSI::Engine.new
       allow(engine).to receive(:project_name).and_return("dummy")
@@ -29,8 +29,8 @@ 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'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
-        to_return(:status => 404, :body => "", :headers => {})
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>/.*/, 'Host'=>'yes-it-shipped.herokuapp.com', 'User-Agent'=>/.*/}).
+         to_return(:status => 404, :body => "", :headers => {})
 
       engine = YSI::Engine.new
       allow(engine).to receive(:project_name).and_return("dummy")
@@ -53,11 +53,12 @@ EOT
             "ysi_config_url"=>"https://raw.githubusercontent.com/cornelius/yes_ship_it/master/yes_ship_it.conf"
           },
           :headers => {
-            'Accept'=>'*/*; q=0.5, application/xml',
-            'Accept-Encoding'=>'gzip, deflate',
-            'Content-Length'=>'338',
+            'Accept'=>'*/*',
+            'Accept-Encoding'=> /.*/,
+            'Content-Length'=>'334',
             'Content-Type'=>'application/x-www-form-urlencoded',
-            'User-Agent'=>'Ruby'
+            'Host'=>'yes-it-shipped.herokuapp.com',
+            'User-Agent' => /.*/
           }).to_return(:status => 200, :body => "", :headers => {})
 
       engine = YSI::Engine.new
@@ -71,4 +72,27 @@ EOT
       expect(assertion.assert(engine.executor)).to eq("dummy-1.1.1")
     end
   end
+
+  it "reads yis_server_url parameter" do
+    config = <<EOT
+assertions:
+  yes_it_shipped:
+    yis_server_url: http://localhost:3000
+EOT
+    engine = YSI::Engine.new
+    engine.read_config(config)
+
+    expect(engine.assertions.first.yis_server_url).to eq("http://localhost:3000")
+  end
+
+  it "has default yis_server_url parameter" do
+    config = <<EOT
+assertions:
+  yes_it_shipped:
+EOT
+    engine = YSI::Engine.new
+    engine.read_config(config)
+
+    expect(engine.assertions.first.yis_server_url).to eq("https://yes-it-shipped.herokuapp.com")
+  end
 end

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

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "given_filesystem"
   s.add_development_dependency "cli_tester", ">= 0.0.2"
   s.add_development_dependency "httpotemkin"
-  s.add_development_dependency "webmock"
+  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.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -110,6 +110,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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
@@ -206,6 +221,7 @@ files:
 - spec/unit/assertions/release_archive_spec.rb
 - spec/unit/assertions/release_branch_spec.rb
 - spec/unit/assertions/submitted_rpm_spec.rb
+- spec/unit/assertions/tag_spec.rb
 - spec/unit/assertions/version_spec.rb
 - spec/unit/assertions/working_directory_spec.rb
 - spec/unit/assertions/yes_it_shipped_spec.rb
@@ -241,10 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: yes_ship_it
-rubygems_version: 2.2.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The ultimate release script
 test_files: []
-has_rdoc: 

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