release_tagger 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44be2464464dd89cd2b526d435d79aad769a8994
-  data.tar.gz: 62e84b205ba5a5c41c965e129211b07ae7faea8f
+  metadata.gz: 8447b80dabdc7b29c854be1bd9f7385e19156ca9
+  data.tar.gz: aebae5d62eed1ca7ae8f4cb75f7a39b4c283bb2a
 SHA512:
-  metadata.gz: 9995162d0fc8a25bb6880c9fd189fdb743a351d2ceffddf91100e2524798ee99f3ad9acceb36b203a637b622c8be75fbb8a7ae165ee753ffeeab3fa36a3dec61
-  data.tar.gz: 75967c652de24f7b0a1ed16b69e147537c321fedb02cd9a4246390342a81b2e8d40ebf807a8b0d6b4e5c4b84fa551e9f0b4b90ed4d6fcf2eeaaeb9ec1805cd98
+  metadata.gz: f2aff2951cd9e160bb99c81955afc620d8bdde7fc38105b5bc7885d919dee201861e629455dc494146121cc5c5d735f8632a16110a2558417355f619a85da20a
+  data.tar.gz: b301b8d3298a15aa805536d0a7faf8da63beba444ce2f68c2635cbc6351e55c680de783a3e6d7c70e10bb15133fce9513587c0c1dd26b6575ef5545dfb710996

data/README.markdown

@@ -4,12 +4,12 @@ A simple command-line tool to manage a git tag-based release workflow.
 It:
 
 1. Ensures the working directory is clean and up-to-date
-2. Ensures a non-master branch is not being released
-3. Bumps the requested version number (major, minor or patch)
-4. Creates a release commit noting changes since the last release
-5. Tags the release commit
-6. Pushes the whole lot to the origin repo
+2. Bumps the requested version number (major, minor or patch)
+3. Creates an annotated tag noting changes since the last release
+4. Pushes the tag to the origin repo
 
+The actual version of the software will be retrieved from our package repository in the cloud
+(packagecloud)
 That's all. Any other build steps are to be managed manually, or by CI
 watching for release tags in the origin repo.
 
@@ -29,6 +29,13 @@ Or install it yourself as:
 
     $ gem install release_tagger
 
+## Configuration
+The only required configuration is the packagecloud API key to retrieve the latest version.
+You can configure it adding the API key (ask the infra/geoff squad for it) at:
+- /etc/release_tagger/packagecloud_token
+- ~/.release_tagger/packagecloud_token
+- as an environment variable, PACKAGECLOUD_API_TOKEN
+
 ## Usage
 
     $ do_release (major|minor|patch)

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/release_tagger/repo.rb

@@ -0,0 +1,59 @@
+require 'net/http'
+require 'json'
+require 'pathname'
+
+module ReleaseTagger
+  class Repo
+    PACKAGECLOUD_ACCOUNT = 'lostmyname'
+    REPO = 'qa'
+    ITEMS_PER_PAGE = 1000
+    VERSIONS_URL = "https://packagecloud.io/api/v1/repos/#{PACKAGECLOUD_ACCOUNT}/#{REPO}/package/rpm/el/7/%s/x86_64/versions.json?per_page=#{ITEMS_PER_PAGE}"
+
+    def get_api_token
+      home_config_file = Pathname.new(File.join(File.expand_path('~'), '.release_tagger', 'packagecloud_token'))
+      etc_config_file = Pathname.new(File.join('/etc', 'release_tagger', 'packagecloud_token'))
+
+      if etc_config_file.exist?
+        package_cloud_api_token = etc_config_file.read.strip
+      elsif home_config_file.exist?
+        package_cloud_api_token = home_config_file.read.strip
+      elsif ENV['PACKAGECLOUD_API_TOKEN']
+        package_cloud_api_token = ENV['PACKAGECLOUD_API_TOKEN']
+      else
+        puts %(Config for packagecloud not found!
+Consider setting your packagecloud api token in any of:
+  - #{home_config_file}
+  - #{etc_config_file}
+  - env var PACKAGECLOUD_API_TOKEN
+)
+        exit 1
+      end
+
+      package_cloud_api_token
+    end
+
+    def get_max_package_version(package_name)
+      pc_api_token = get_api_token
+      uri = URI.parse(VERSIONS_URL % package_name)
+      req = Net::HTTP::Get.new(uri)
+      req.basic_auth pc_api_token, ''
+      response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http| http.request(req)}
+
+      unless response.is_a?(Net::HTTPOK)
+        puts "Error trying to get latest version of package #{package_name}"
+        puts response.code
+        exit 1
+      end
+
+      res = JSON.parse(response.body)
+      release_version = '1.0.0'
+      unless res == []
+        latest_package = res.select { |package| package['name'] == package_name}.max_by{ |package| package['version']}
+        release_version = latest_package['version']
+      end
+      release_version
+    end
+  end
+end
+
+

data/lib/release_tagger.rb

@@ -1,4 +1,5 @@
 require "release_tagger/version"
+require_relative "release_tagger/repo"
 require 'pathname'
 
 module ReleaseTagger
@@ -25,6 +26,9 @@ module ReleaseTagger
 
   class << self
 
+    TAG_PRODUCTION = '-prod'
+    TAG_QA         = '-qa'
+
     def color_terminal?
       ENV["TERM"] =~ /color/
     end
@@ -73,18 +77,42 @@ module ReleaseTagger
       %x{git status --porcelain 2>/dev/null | egrep "^(M| M)"}.strip != ""
     end
 
+    def release_tag
+      if on_master_branch?
+        TAG_PRODUCTION
+      else
+        TAG_QA
+      end
+    end
+
     def release_message(version)
-      "Release v#{version}"
+      "Release #{version}#{release_tag}"
     end
 
-    def changelog(old_version)
-      commits = %x{git log --pretty="format:* %s" v#{old_version}..HEAD}
+    def changelog
+      # Get commits since latest tag if any (in this branch or from the original branched one)
+      commits = ''
+      previous_tag = %x{git describe --abbrev=0 --tags --match *.*.*}.strip
       unless $?.success?
-        raise RuntimeError, "Error getting changelog!"
+        raise RuntimeError, "Error getting previous tag!"
+      end
+      unless previous_tag == ''
+        commits = %x{git log --pretty="format:* %s" #{previous_tag}..HEAD}
+        unless $?.success?
+          raise RuntimeError, "Error getting changelog!"
+        end
       end
       commits
     end
 
+    def get_repo_name
+      repo_name = %x{basename `git rev-parse --show-toplevel`}.strip
+      unless $?.success?
+        raise RuntimeError, "Error getting repo name!"
+      end
+      repo_name
+    end
+
     def run!
       if ARGV.length != 1
         usage
@@ -93,16 +121,11 @@ module ReleaseTagger
 
       release_type = ARGV.first
 
-      if !valid_release_type?(release_type)
+      unless valid_release_type?(release_type)
         usage
         exit 1
       end
 
-      if !on_master_branch?
-        err "You must be on the master branch to make a release"
-        exit 1
-      end
-
       if behind_origin?
         err "You are behind the origin/master branch - please pull before releasing."
         exit 1
@@ -114,14 +137,8 @@ module ReleaseTagger
         exit 1
       end
 
-      version_file = Pathname.getwd.join("VERSION")
-
-      if !version_file.exist?
-        err "Could not find VERSION file - this must be present to make a release"
-        exit 1
-      end
-
-      old_version_string = version_file.read.strip
+      package_name       = 'lmn-' + get_repo_name
+      old_version_string = Repo.new().get_max_package_version(package_name)
       old_version_parts  = old_version_string.split(".").map(&:to_i)
       old_version        = Version.new(*old_version_parts)
       new_version        = old_version.bump(release_type)
@@ -132,42 +149,25 @@ module ReleaseTagger
         exit 1
       end
 
-      if !version_file.writable?
-        err "Could not write to VERSION file - please check you have write permissions"
-        exit 1
-      end
-
-      log "Updating VERSION file to #{new_version}"
-      version_file.open("w") do |f|
-        f.write(new_version.to_s)
-      end
-
-      log "Creating release commit"
-      commits = changelog(old_version)
-      commit_output = %x{git add -u . && git commit -m "#{release_message(new_version)}\n\n#{commits}" 2>&1}
-      unless $?.success?
-        err "Error committing VERSION update:"
-        err commit_output
-        exit 1
-      end
-
       log "Adding release tag"
-      tag_output = %x{git tag v#{new_version} 2>&1}
+      commits = changelog
+      tag_output = %x{git tag -a #{new_version}#{release_tag} -m "#{release_message(new_version)}\n\n#{commits}" 2>&1}
       unless $?.success?
-        err "Error adding version tag v#{new_version}:"
+        err "Error adding version tag #{new_version}#{release_tag}:"
         err tag_output
         exit 1
       end
 
-      log "Pushing release to origin"
+      log "Pushing tags to origin"
       # Separate `push` and `push --tags` here, because only relatively recent
       # versions of git push both refs and tags with the single command.
-      push_output = %x{git push 2>&1 && git push --tags 2>&1}
+      push_output = %x{git push --tags 2>&1}
       unless $?.success?
         err "Error pushing release tag to origin:"
         err push_output
         exit 1
       end
+      log "Pushed version #{new_version}"
     end
   end
 end

data/release_tagger.gemspec

@@ -6,11 +6,11 @@ require 'release_tagger/version'
 Gem::Specification.new do |spec|
   spec.name          = "release_tagger"
   spec.version       = ReleaseTagger::VERSION
-  spec.authors       = ["Simon Coffey"]
+  spec.authors       = ["Simon Coffey", "Nadir Lloret"]
   spec.email         = ["dev@lostmy.name"]
   spec.license       = "MIT"
 
-  spec.summary       = %q{Helpers for managing a simple git tag-based release workflow}
+  spec.summary       = %q{Helpers for managing a git tag-based release workflow integrated with packagecloud}
   spec.description   = %q{A set of helpers for tagging releases and logging changes between releases}
   spec.homepage      = "https://github.com/Lostmyname/release_tagger"
 

metadata

@@ -1,75 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: release_tagger
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon Coffey
+- Nadir Lloret
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.32.1
 description: A set of helpers for tagging releases and logging changes between releases
@@ -80,9 +81,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CODE_OF_CONDUCT.markdown
 - Gemfile
 - MIT-LICENSE
@@ -93,6 +94,7 @@ files:
 - bin/setup
 - exe/do_release
 - lib/release_tagger.rb
+- lib/release_tagger/repo.rb
 - lib/release_tagger/version.rb
 - release_tagger.gemspec
 homepage: https://github.com/Lostmyname/release_tagger
@@ -105,18 +107,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Helpers for managing a simple git tag-based release workflow
+summary: Helpers for managing a git tag-based release workflow integrated with packagecloud
 test_files: []