yes_ship_it 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78b481295a4a4a9ba607adb08eec58bac7f207a0
-  data.tar.gz: c8b0e1378e39c261db0c58c6858bfbf7c9cca3fd
+  metadata.gz: 5ac91756b1bb840377155a902332884700512392
+  data.tar.gz: 8082dd501a30d1b6cc9957e2b138011b01e6e4a9
 SHA512:
-  metadata.gz: 51adeca1f94982d83fe0f7f089b1e40630da8d7da5324a2907edf1cda869fc40b63abbee3f1bdf77be9710c8a9b08380d186c958347898d6691af094f69c4d02
-  data.tar.gz: c6e49865aa4a412d8677326febf8ed07361b921569b04566a57fbd22d28cec6b511b0cbe43f8fcc2f1d7872b7efa71b03641e9ad58b3c35e0486dd581edfa6fe
+  metadata.gz: 7e1aed4610021735afbf02647af9d66c4580131b27d0da3ac2db3b686e405d56f4652688fd00d1632ae6784d97031ba9e20a0434de2e6a100fcaed5761176b71
+  data.tar.gz: a48fe139e07ad8d7ad333ec18f1806e84cc83c294fa7810058bbf9395ce7d91c661bb369c01d10becfbcd21afa8c99b4a746b63b565b3c24fbd52b2b8f1b6c55

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log of yes_ship_it
 
+## 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/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.parse($1)
+          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/yes_it_shipped.rb

@@ -18,7 +18,7 @@ module YSI
     def assert(executor)
       executor.http_post("https://yes-it-shipped.herokuapp.com/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/lib/version.rb

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

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.rb

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

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"))).

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yes_ship_it
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Cornelius Schumacher
@@ -206,6 +206,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