yes_ship_it 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166ad586d456c70e04254032cacb88b08137af90
-  data.tar.gz: 0b544b73f9391fa9eabe47e4d9ab1c86e934e7a6
+  metadata.gz: 168ad942fbfdb7207ece3f1fce5986fac3511b43
+  data.tar.gz: 57c44bc9c84c57bd10db8b989f886b3a9c596b69
 SHA512:
-  metadata.gz: 937111a8dbbfcfae794dbd7b49db9520d5fe16923cff77628bfeb16de21f8a48201245b4167b36241de8b4031918e29a93ddb050fd03328e7a075f8b44276338
-  data.tar.gz: 1247311f1d7fb9465b8a6a34ae841feb28e8ebe90216466eafa149ac4febcb3023f66743dec4289be37d8dd8aec29e9c2dcd33e65fbcc663da198ee8aba29a4d
+  metadata.gz: d36f142bd4848d0187e030f3d881027d140fa8e922fe3d4b91db372e709e8ddc14266157ddecef0c849058af7dd9e71195d5c10ce57de2e2dedfc2c17de1dc9c
+  data.tar.gz: 84a63ab61af12d0c76f173daf0c226c1f97cbb13581441499963c2ec99601b7c255b2c5306ae2f99b3a447b1c66d05c63e25f949976d186731e943055b789db8

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log of yes_ship_it
 
+## Version 0.0.5
+
+* Handle missing credentials for Rubygems, when pushing gems
+* Handle the case when the origin in your git configuration includes the .git
+  extension
+* When pushing to yes_it_shipped use the date is when the release happened not
+  when the release was pushed to the site (Issue #9)
+* Add assertion `pushed_code` to check, if the released has been pushed to the
+  remote repository
+
 ## Version 0.0.4
 
 * Add yes_it_shipped assertion

data/assertions/published_gem.rb

@@ -27,7 +27,16 @@ module YSI
 
     def assert(dry_run: false)
       if !dry_run
-        `gem push #{gem_file}`
+        begin
+          if !File.exist?(File.expand_path("~/.gem/credentials"))
+            @error = "You need to log in to Rubygems first by running `gem push #{gem_file}` manually"
+            return nil
+          end
+          Cheetah.run(["gem", "push", gem_file])
+        rescue Cheetah::ExecutionFailed => e
+          @error = e.message
+          return nil
+        end
       end
       gem_file
     end

data/assertions/pushed_code.rb

@@ -0,0 +1,24 @@
+module YSI
+  class PushedCode < Assertion
+    needs "release_branch"
+
+    def display_name
+      "pushed code"
+    end
+
+    def check
+      if Git.new.needs_push?
+        return nil
+      else
+        return "up-to-date"
+      end
+    end
+
+    def assert(dry_run: false)
+      if !dry_run
+        Git.new.push
+      end
+      return "pushed"
+    end
+  end
+end

data/assertions/release_archive.rb

@@ -34,7 +34,9 @@ module YSI
           FileUtils.mkdir_p(File.dirname(release_archive))
           excludes = [".git", ".gitignore", "yes_ship_it.conf"]
           exclude_options = excludes.map { |e| "--exclude '#{e}'" }.join(" ")
-          system("cd #{tmp_dir}; tar czf #{release_archive} #{exclude_options} #{archive_dir}")
+          if !system("cd #{tmp_dir}; tar czf #{release_archive} #{exclude_options} #{archive_dir}")
+            return nil
+          end
         end
       end
       filename

data/assertions/yes_it_shipped.rb

@@ -1,5 +1,7 @@
 module YSI
   class YesItShipped < Assertion
+    needs "tag"
+
     def display_name
       "pushed to yes-it-shipped"
     end
@@ -18,7 +20,7 @@ module YSI
         begin
           RestClient.post("https://yes-it-shipped.herokuapp.com/releases",
             project: engine.project_name, version: engine.version,
-            release_date_time: Time.now, 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)
         rescue RestClient::Exception
           return nil

data/configs/ruby_gem.conf

@@ -7,4 +7,5 @@ assertions:
   - built_gem
   - published_gem
   - pushed_tag
+  - pushed_code
   - yes_it_shipped

data/lib/version.rb

@@ -1,3 +1,3 @@
 module YSI
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/yes_ship_it/engine.rb

@@ -147,6 +147,10 @@ module YSI
             out.print "Asserting #{assertion.display_name}: "
             success = assertion.assert(dry_run: dry_run)
             if !success
+              if assertion.error
+                out.puts "error"
+                out.puts "  " + assertion.error
+              end
               out.puts
               out.puts "Ran into an error. Stopping shipping."
               return 1

data/lib/yes_ship_it/git.rb

@@ -1,11 +1,29 @@
 module YSI
   class Git
+    def initialize(working_dir = Dir.pwd)
+      @working_dir = working_dir
+    end
+
     def run_git(args)
-      `git #{args}`
+      Dir.chdir(@working_dir) do
+        `git #{args}`
+      end
     end
 
     def origin
-      run_git("remote -v").match(/origin\s+(.*)\s+\(push\)/)[1]  
+      run_git("remote -v").match(/origin\s+(.*?)(\.git)?\s+\(push\)/)[1]
+    end
+
+    def needs_push?
+      local_master = run_git("rev-parse master")
+      remote_master = run_git("rev-parse origin/master")
+      base = run_git("merge-base master origin/master")
+
+      remote_master == base && local_master != remote_master
+    end
+
+    def push
+      `git push`
     end
   end
 end

data/lib/yes_ship_it.rb

@@ -4,6 +4,7 @@ require "optparse"
 require "inifile"
 require "rexml/document"
 require "erb"
+require "cheetah"
 
 require_relative "yes_ship_it/assertion.rb"
 require_relative "yes_ship_it/engine.rb"

data/spec/integration/cli_spec.rb

@@ -164,7 +164,8 @@ Checking built gem: error
   I need a gemspec: test_project.gemspec
 Checking published gem: skip (because dependency errored)
 Checking pushed tag: skip (because dependency errored)
-Checking pushed to yes-it-shipped: fail
+Checking pushed code: skip (because dependency errored)
+Checking pushed to yes-it-shipped: skip (because dependency errored)
 
 Couldn't ship test_project. Help me.
 EOT

data/spec/system/ruby_gem_spec.rb

@@ -1,26 +1,38 @@
 require_relative "spec_helper"
 
 describe "ship ruby gem" do
-  it "builds gem" do
-    out = double
-    allow(out).to receive(:puts)
+  before(:all) do
+    out = StringIO.new
+    @test = Httpotemkin::Test.new(out: out)
+    @test.add_server("rubygems")
+    @test.add_server("api.rubygems")
+    @test.add_server("obs")
+    @test.up
+  end
 
-    test = Httpotemkin::Test.new(out: out)
-    test.add_server("rubygems")
-    test.add_server("api.rubygems")
-    test.add_server("obs")
+  after(:all) do
+    @test.down
+  end
 
-    test.run do |client|
-      client.install_gem_from_spec("yes_ship_it.gemspec")
+  before(:each) do
+    @client = @test.start_client
+    @client.install_gem_from_spec("yes_ship_it.gemspec")
+    remote_tar = File.expand_path("../data/red_herring-remote.tar.gz", __FILE__)
+    @client.inject_tarball(remote_tar)
+  end
+
+  after(:each) do
+    @test.stop_client
+  end
 
-      remote_tar = File.expand_path("../data/red_herring-remote.tar.gz", __FILE__)
+  context "with existing credentials" do
+    it "builds gem" do
       checkout_tar = File.expand_path("../data/red_herring-checkout-build.tar.gz", __FILE__)
-      client.inject_tarball(remote_tar)
-      client.inject_tarball(checkout_tar)
+      @client.inject_tarball(checkout_tar)
 
-      client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
 
-      expect(client.exit_code).to eq(0)
+      expect(@client.exit_code).to eq(0)
 
       expected_output = <<EOT
 Shipping...
@@ -34,32 +46,18 @@ Asserting release archive: red_herring-0.0.2.tar.gz
 
 Shipped red_herring 0.0.2. Hooray!
 EOT
-      expect(client.out).to eq(expected_output)
+      expect(@client.out).to eq(expected_output)
 
-      expect(client.err.empty?).to be(true)
+      expect(@client.err).to eq("")
     end
-  end
-
-  it "pushes gem if it isn't pushed yet" do
-    out = double
-    allow(out).to receive(:puts)
-
-    test = Httpotemkin::Test.new(out: out)
-    test.add_server("rubygems")
-    test.add_server("api.rubygems")
-    test.add_server("obs")
 
-    test.run do |client|
-      client.install_gem_from_spec("yes_ship_it.gemspec")
-
-      remote_tar = File.expand_path("../data/red_herring-remote.tar.gz", __FILE__)
+    it "pushes gem if it isn't pushed yet" do
       checkout_tar = File.expand_path("../data/red_herring-checkout-push.tar.gz", __FILE__)
-      client.inject_tarball(remote_tar)
-      client.inject_tarball(checkout_tar)
+      @client.inject_tarball(checkout_tar)
 
-      client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
 
-      expect(client.exit_code).to eq(0)
+      expect(@client.exit_code).to eq(0)
 
       expected_output = <<EOT
 Shipping...
@@ -75,32 +73,19 @@ Asserting published gem: red_herring-0.0.2.gem
 
 Shipped red_herring 0.0.2. Hooray!
 EOT
-      expect(client.out).to eq(expected_output)
 
-      expect(client.err.empty?).to be(true)
-    end
-  end
-
-  it "doesn't push gem if it already is pushed" do
-    out = double
-    allow(out).to receive(:puts)
-
-    test = Httpotemkin::Test.new(out: out)
-    test.add_server("rubygems")
-    test.add_server("api.rubygems")
-    test.add_server("obs")
+      expect(@client.out).to eq(expected_output)
 
-    test.run do |client|
-      client.install_gem_from_spec("yes_ship_it.gemspec")
+      expect(@client.err).to eq("")
+    end
 
-      remote_tar = File.expand_path("../data/red_herring-remote.tar.gz", __FILE__)
+    it "doesn't push gem if it already is pushed" do
       checkout_tar = File.expand_path("../data/red_herring-checkout-not-push.tar.gz", __FILE__)
-      client.inject_tarball(remote_tar)
-      client.inject_tarball(checkout_tar)
+      @client.inject_tarball(checkout_tar)
 
-      client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
 
-      expect(client.exit_code).to eq(0)
+      expect(@client.exit_code).to eq(0)
 
       expected_output = <<EOT
 Shipping...
@@ -111,9 +96,46 @@ Checking published gem: 0.0.1
 
 red_herring 0.0.1 already shipped
 EOT
-      expect(client.out).to eq(expected_output)
+      expect(@client.out).to eq(expected_output)
 
-      expect(client.err.empty?).to be(true)
+      expect(@client.err.empty?).to be(true)
+    end
+  end
+
+  context "without existing credentials" do
+    before(:each) do
+      @client.execute(["mv", "/root/.gem/credentials", "/tmp"])
+
+      checkout_tar = File.expand_path("../data/red_herring-checkout-push.tar.gz", __FILE__)
+      @client.inject_tarball(checkout_tar)
+    end
+
+    after(:each) do
+      @client.execute(["mv", "/tmp/credentials", "/root/.gem/"])
+    end
+
+    it "tells how to login" do
+      @client.execute(["yes_ship_it.ruby2.1"], working_directory: "red_herring")
+
+      expect(@client.exit_code).to eq(1)
+
+      expected_output = <<EOT
+Shipping...
+
+Checking version number: 0.0.2
+Checking tag: fail
+Checking built gem: fail
+Checking published gem: fail
+
+Asserting tag: v0.0.2
+Asserting built gem: red_herring-0.0.2.gem
+Asserting published gem: error
+  You need to log in to Rubygems first by running `gem push red_herring-0.0.2.gem` manually
+
+Ran into an error. Stopping shipping.
+EOT
+      expect(@client.out).to eq(expected_output)
+      expect(@client.err.empty?).to be(true)
     end
   end
 end

data/spec/unit/assertions/published_gem_spec.rb

@@ -0,0 +1,14 @@
+require_relative "../spec_helper.rb"
+
+describe YSI::PublishedGem do
+  describe "#assert" do
+    it "returns nil if there is an error" do
+      engine = YSI::Engine
+      allow(engine).to receive(:project_name).and_return("IdontExist")
+      allow(engine).to receive(:version).and_return("0.0")
+      assertion = YSI::PublishedGem.new(YSI::Engine)
+
+      expect(assertion.assert).to be(nil)
+    end
+  end
+end

data/spec/unit/assertions/pushed_code_spec.rb

@@ -0,0 +1,20 @@
+require_relative "../spec_helper"
+
+include GivenFilesystemSpecHelpers
+
+describe YSI::PushedCode do
+  use_given_filesystem
+
+  it "pushes code" do
+    expect_any_instance_of(YSI::Git).to receive(:push).and_return("pushed")
+    dir = given_directory
+    setup_test_git_repo("007", dir)
+
+    engine = YSI::Engine.new
+    assertion = YSI::PushedCode.new(engine)
+    Dir.chdir(File.join(dir, "red_herring")) do
+      expect(assertion.check).to be(nil)
+      expect(assertion.assert).to eq "pushed"
+    end
+  end
+end

data/spec/unit/assertions/yes_it_shipped_spec.rb

@@ -42,7 +42,6 @@ EOT
 
   describe "#assert" do
     it "pushes release" do
-      allow(Time).to receive(:now).and_return(Time.parse("20151208T141655+0100"))
       stub_request(:post, "https://yes-it-shipped.herokuapp.com/releases").
         with(
           :body => {
@@ -64,6 +63,7 @@ EOT
       engine = YSI::Engine.new
       allow(engine).to receive(:project_name).and_return("dummy")
       engine.version = "1.1.1"
+      engine.tag_date = Time.parse("20151208T141655+0100")
 
       assertion = YSI::YesItShipped.new(engine)
 

data/spec/unit/git_spec.rb

@@ -1,13 +1,46 @@
 require_relative "spec_helper"
 
+include GivenFilesystemSpecHelpers
+
 describe YSI::Git do
-  it "#origin" do
-    allow(subject).to receive(:run_git).with("remote -v").and_return(<<EOT
+  describe "#origin" do
+
+    it "grabs the url without the extension" do
+      allow(subject).to receive(:run_git).with("remote -v").and_return(<<EOT
 origin  git@github.com:cornelius/red_herring (fetch)
 origin  git@github.com:cornelius/red_herring (push)
 EOT
-    )
+      )
+      expect(subject.origin).to eq("git@github.com:cornelius/red_herring")
+    end
+
+    it "grabs the url with the extension" do
+      allow(subject).to receive(:run_git).with("remote -v").and_return(<<EOT
+origin  git@github.com:cornelius/red_herring.git (fetch)
+origin  git@github.com:cornelius/red_herring.git (push)
+EOT
+      )
+      expect(subject.origin).to eq("git@github.com:cornelius/red_herring")
+    end
+  end
+
+  describe "#needs_push?" do
+    use_given_filesystem
+
+    it "returns true if local changes are not in remote branch" do
+      dir = given_directory
+      setup_test_git_repo("007", dir)
+      git = YSI::Git.new(File.join(dir, "red_herring"))
+
+      expect(git.needs_push?).to be(true)
+    end
+
+    it "returns false if local changes are in remote branch" do
+      dir = given_directory
+      setup_test_git_repo("008", dir)
+      git = YSI::Git.new(File.join(dir, "red_herring"))
 
-    expect(subject.origin).to eq("git@github.com:cornelius/red_herring")
+      expect(git.needs_push?).to be(false)
+    end
   end
 end

data/yes_ship_it.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "inifile"
   s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "cheetah"
 
   s.add_development_dependency "rspec", "~>3"
   s.add_development_dependency "given_filesystem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yes_ship_it
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cheetah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +140,7 @@ files:
 - assertions/built_gem.rb
 - assertions/change_log.rb
 - assertions/published_gem.rb
+- assertions/pushed_code.rb
 - assertions/pushed_tag.rb
 - assertions/release_archive.rb
 - assertions/release_branch.rb
@@ -151,6 +166,8 @@ files:
 - spec/data/red_herring-004.tar.gz
 - spec/data/red_herring-005.tar.gz
 - spec/data/red_herring-006.tar.gz
+- spec/data/red_herring-007.tar.gz
+- spec/data/red_herring-008.tar.gz
 - spec/data/version/version.go
 - spec/data/version/version.rb
 - spec/data/yes_ship_it.conf
@@ -167,6 +184,8 @@ files:
 - spec/system/spec_helper.rb
 - spec/unit/assertion_spec.rb
 - spec/unit/assertions/change_log_spec.rb
+- spec/unit/assertions/published_gem_spec.rb
+- spec/unit/assertions/pushed_code_spec.rb
 - spec/unit/assertions/pushed_tag_spec.rb
 - spec/unit/assertions/release_archive_spec.rb
 - spec/unit/assertions/release_branch_spec.rb