simple-cli 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c838ad9921bef80717cd3a61c33d68e794adb84799b7e764cc8f23e8fc30db
-  data.tar.gz: a3266ec697b770e68add5bbe8511db6253aa9453e4bde36cf86cddecc5577bff
+  metadata.gz: 396da74801c8dbe4910923bec2ad720181966e27c543afee855ff15b8e807f28
+  data.tar.gz: f2f1d11130bd1b2ac43c40308c71eaec78a148662ab65ce55b5dcbdaa201834c
 SHA512:
-  metadata.gz: 198ffc917415a4221f1b2de93ff32f42e55dfb480b0bd8f51b2d191277ac3206c801d0cc14ada5bc6c18e2aad38447ddf93a1b303f0254e9f28e2821907f654b
-  data.tar.gz: cc2f55d0a681d4376eeff4b76f27f40199e3248b53736fe8f1061307328764477e212cff2e429a01c1dc28b7f214e0eb19f8839acc30e5e65d0d8196115c4c2d
+  metadata.gz: 10b9f1865828bba3102bd0a93f711d99449923a6d8159597035dd552174411c0c3286071c69005fe400948f10acb534ed87ba9a7e436647f36b47e49c6337953
+  data.tar.gz: 6c36d0894fc438c4058824239db56020b8075193daa6638f93587e712c8e2dfa128999b56bde2802c2d23dace843800cab7f8c98d94cc6c3a1d5ebf4ee5a8d89

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/scripts/release

@@ -0,0 +1,2 @@
+#!/bin/bash
+$0.rb "$@"

data/scripts/release.rb

@@ -0,0 +1,91 @@
+#!/usr/bin/env ruby
+
+# -- helpers ------------------------------------------------------------------
+
+def sys(cmd)
+  STDERR.puts "> #{cmd}"
+  system cmd
+  return true if $?.success?
+
+  STDERR.puts "> #{cmd} returned with exitstatus #{$?.exitstatus}"
+  $?.success?
+end
+
+def sys!(cmd, error: nil)
+  return true if sys(cmd)
+  STDERR.puts error if error
+  exit 1
+end
+
+def die!(msg)
+  STDERR.puts msg
+  exit 1
+end
+
+ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
+
+GEMSPEC = Dir.glob("*.gemspec").first || die!("Missing gemspec file.")
+
+# -- Version reading and bumping ----------------------------------------------
+
+module Version
+  extend self
+
+  VERSION_FILE = "#{Dir.getwd}/VERSION"
+
+  def read_version
+    version = File.exist?(VERSION_FILE) ? File.read(VERSION_FILE) : "0.0.1"
+    version.chomp!
+    raise "Invalid version number in #{VERSION_FILE}" unless version =~ /^\d+\.\d+\.\d+$/
+    version
+  end
+
+  def auto_version_bump
+    old_version_number = read_version
+    old = old_version_number.split(".")
+
+    current = old[0..-2] << old[-1].next
+    current.join(".")
+  end
+
+  def bump_version
+    next_version = ENV["VERSION"] || auto_version_bump
+    File.open(VERSION_FILE, "w") { |io| io.write next_version }
+  end
+end
+
+# -- check, bump, release a new gem version -----------------------------------
+
+Dir.chdir ROOT
+$BASE_BRANCH = ENV["BRANCH"] || "master"
+
+# ENV["BUNDLE_GEMFILE"] = "#{Dir.getwd}/Gemfile"
+# sys! "bundle install"
+
+sys! "git diff --exit-code > /dev/null", error: "There are unstaged changes in your working directory"
+sys! "git diff --cached --exit-code > /dev/null", error: "There are staged but uncommitted changes"
+
+sys! "git checkout #{$BASE_BRANCH}"
+sys! "git pull"
+
+Version.bump_version
+version = Version.read_version
+
+sys! "git add VERSION"
+sys! "git commit -m \"bump gem to v#{version}\""
+sys! "git tag -a v#{version} -m \"Tag #{version}\""
+
+sys! "gem build #{GEMSPEC}"
+
+sys! "git push origin #{$BASE_BRANCH}"
+sys! "git push --tags --force"
+sys! "gem push #{Dir.glob("*.gem").first}"
+
+sys! "mkdir -p pkg"
+sys! "mv *.gem pkg"
+
+STDERR.puts <<~MSG
+  ================================================================================
+  Thank you for releasing a new gem version. You made my day.
+  ================================================================================
+    MSG

data/simple-cli.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '~> 2.3'
 
   # optional gems (required by some of the parts)
-  gem.add_dependency "simple-service", "~> 0.1.2"
+  gem.add_dependency "simple-service", "~> 0.1.4"
 
   # development gems
   gem.add_development_dependency 'rake', '~> 12'

data/tasks/release.rake

@@ -1,89 +1,3 @@
-require 'bundler'
-Bundler.setup
-
-GEM_ROOT = File.expand_path('../../', __FILE__)
-GEM_SPEC = "simple-cli.gemspec"
-
-require 'simple/cli/version'
-VERSION_FILE_PATH = 'lib/simple/cli/version.rb'
-
-class VersionNumberTracker
-  class << self
-    def update_version_file(old_version_number, new_version_number)
-      old_line = "VERSION = \"#{old_version_number}\""
-      new_line = "VERSION = \"#{new_version_number}\""
-      update = File.read(VERSION_FILE_PATH).gsub(old_line, new_line)
-      File.open(VERSION_FILE_PATH, 'w') { |file| file.puts update }
-      new_version_number
-    end
-
-    def auto_version_bump
-      old_version_number = Simple::CLI::VERSION
-      old = old_version_number.split('.')
-      current = old[0..-2] << old[-1].next
-      new_version_number = current.join('.')
-
-      update_version_file(old_version_number, new_version_number)
-    end
-
-    def manual_version_bump
-      update_version_file(Simple::CLI::VERSION, ENV['VERSION'])
-    end
-
-    def update_version_number
-      @version = ENV['VERSION'] ? manual_version_bump : auto_version_bump
-    end
-
-    attr_reader :version
-  end
+task :release do
+  sh "scripts/release"
 end
-
-namespace :release do
-  task :version do
-    VersionNumberTracker.update_version_number
-  end
-
-  task :build do
-    Dir.chdir(GEM_ROOT) do
-      sh("gem build #{GEM_SPEC}")
-    end
-  end
-
-  desc "Commit changes"
-  task :commit do
-    Dir.chdir(GEM_ROOT) do
-      version = VersionNumberTracker.version
-      sh("git add #{VERSION_FILE_PATH}")
-      sh("git commit -m \"bump to v#{version}\"")
-      sh("git tag -a v#{version} -m \"Tag\"")
-    end
-  end
-
-  desc "Push code and tags"
-  task :push do
-    sh('git push origin master')
-    sh('git push --tags')
-  end
-
-  desc "Cleanup"
-  task :clean do
-    Dir.glob(File.join(GEM_ROOT, '*.gem')).each { |f| FileUtils.rm_rf(f) }
-  end
-
-  desc "Push Gem to gemfury"
-  task :push_to_rubygems do
-    Dir.chdir(GEM_ROOT) { sh("gem push #{Dir.glob('*.gem').first}") }
-  end
-
-  task default: [
-    'version',
-    'clean',
-    'build',
-    'commit',
-    'push',
-    'push_to_rubygems'
-  ]
-end
-
-desc "Clean, build, commit and push"
-task release: 'release:default'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-service
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,8 @@ files:
 - lib/simple/cli/runner.rb
 - lib/simple/cli/version.rb
 - log/.gitkeep
+- scripts/release
+- scripts/release.rb
 - simple-cli.gemspec
 - spec/.keep
 - spec/spec_helper.rb