revision 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94dfd966e2e44d185a37be41bb1fe745455f0e6d
-  data.tar.gz: cf971a767a20dbc24696adff7bbf634e821e8ea0
+  metadata.gz: 55b3b63b9295116b52dbcac518a8789c5fe8e7c5
+  data.tar.gz: be8782476acbecaf6b6f9d303093af3ddd0bfb97
 SHA512:
-  metadata.gz: 7e5ec6a596855ad4f50c5ee1307c9cfac3e4c7fe4918f6e4c03b00879c8e7824caa1675bea87d9ac4b0601b165bf6f6b8e1dd2c7e5e95b31e3f6450fe759d994
-  data.tar.gz: 6b71b8ed50740a488904d66b35e52bdcfb14dd5ec5bfcd71cef1cd387e94cdbfd8816584a60fec3342e6133820c108a53cf299dc6964e03207b205fa28a08440
+  metadata.gz: 6969897886cbab7ebbcf2afd045767973377fe0681aa9d2df8966259772d3c7ebd8a15fe9288ac0307cdcfe1c5cd2a9702084cbef7dfef7712f3d170bb588587
+  data.tar.gz: 0e5f2227fa5202cadacf356dae567f9424b828b8773df96c3dfd38bd2e54f272d646670a4f0d22674c8788cbab041224bc4a27b337d3d1ad2bbb7f03d2777261

data/lib/revision/cli.rb

@@ -11,7 +11,6 @@ module Revision
 
     def initialize(*args)
       super
-      #TODO Update this to traverse up the folder heirarchy until we find a releasables.yaml
       wd = Dir.getwd
       loop do
         begin

data/lib/revision/releasable.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'yaml'
 require 'zip'
-require 'git'
+# require 'rugged'
 
 module Revision
 
@@ -47,6 +47,12 @@ module Revision
       releasables
     end
 
+    # def git_repo
+    #   @git_repo ||= Rugged::Repository.discover('.')
+    #   puts 'WARNING: No git repo found in this directory or its ancestors' if @git_repo.nil?
+    #   @git_repo
+    # end
+
     def initialize(root: nil, config: {})
 
       root ||= Dir.getwd
@@ -92,25 +98,19 @@ module Revision
           commit_lines += changelog_entry[2..-1]
         end
         commit_message = commit_lines.join("\n")
-        g = Git.init
         puts "Committing..."
         puts commit_message
-        g.commit_all(commit_message)
+        system("git commit -a -m \"#{commit_message}\"")
         puts "Tagging as #{tag_id}"
-        g.add_tag(tag_id)
+        system("git tag -a #{tag_id} -m \"#{changelog_entry.join("\n")}\"")
       end
     end
 
     def push
       pushed = false
       Dir.chdir(@root) do
-        g = Git.init
-        begin
-          g.push('origin', g.current_branch, tags: true)
-          pushed = true
-        rescue GitExecuteError => e
-          puts "ERROR :: Cannot push to origin :: #{e}"
-        end
+        pushed = system("git push") && system("git push --tags")
+        puts "ERROR :: Failed to push to remote" unless pushed
       end
       pushed
     end

data/lib/revision/version.rb

@@ -1,10 +1,20 @@
 # Defines the revision ID for the revision gem
 module Revision
-  VERSION = "1.1.4"
+  VERSION = "1.1.7"
 end
 
 # <BEGIN CHANGELOG>
 # 
+# Version 1.1.7 (15 Dec 2017)
+# - Corrected push -- was pushing tags without commit
+# 
+# Version 1.1.6 (15 Dec 2017)
+# - Added full changelog entry as tag message
+# - Removed ruby-git dependency from gemspec
+# 
+# Version 1.1.5 (15 Dec 2017)
+# - Replaced ruby-git library with shell calls, as wasn't handling submodules correctly
+# 
 # Version 1.1.4 (14 Dec 2017)
 # - Minor message body reformatting
 # 

data/revision.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
   spec.add_runtime_dependency 'rubyzip'
-  spec.add_runtime_dependency 'git'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revision
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.7
 platform: ruby
 authors:
 - Cormac Cannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  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: bundler
   requirement: !ruby/object:Gem::Requirement