releasecop 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c52b5d851e1d82c6581b8639b55f0b091abc7053
-  data.tar.gz: 9d5cfdebc66eb5e3465d74fbc33c11ab79b90026
+SHA256:
+  metadata.gz: 7dd985648928239cfa8aeb5b928a96d45ce23e8664b7b89204966f435cc2be8f
+  data.tar.gz: dd2fae3fdbd696d77cad1dbb144b8808d80828850d722b9302d897e34bc7e1ff
 SHA512:
-  metadata.gz: 82cd9904b61996b94b6e2840a8fe5055ac4798554e05cb858da4457d46e84d0e27a52f118f524d07ac71d3a19caef0153c126b58997ea56e7e3d432312f1a05b
-  data.tar.gz: daf19f8bba5a58b9894391267f4a69e63c4d10c9ff9f62bd0826ad7765b282210159f018d0084a0bc67d57ae3f5af8ad1dc4d054d7139f208885329c5004ed75
+  metadata.gz: 26d8e1ff98357d04d30e1c39443aa4dec017c65180f0bbbde4a0fdf0dc3faa52134eecb0d6c07756ba5374a18e2f9f8c8b290cb5724bd3f045b9cee4b2f51a6a
+  data.tar.gz: 1cc9a25fee8f82ee0bdab9e1842cf2fb24bc6cc9d77203a66d93c3e26d57152010f34b0e3b17542f7a1b9c7c8b86ac7086fdd27467bee46e6331a63b5e44a80a

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+(Next)
+------------
+
+* Your contribution here.
+
+0.0.5 (2018-04-24)
+------------------
+
+* [#5](https://github.com/joeyAghion/releasecop/pull/5): Add support for Hokusai ([@ashkan18](https://github.com/ashkan18))

data/README.md

@@ -12,7 +12,7 @@ Open the manifest file, which defines projects to monitor:
 
     releasecop edit
 
-In the manifest, each project lists the environments to which code is deployed _in order of promotion_. Environments are defined by a `name` and `git` remote. E.g., a github repo for development and heroku apps for staging and production. Optionally, an environment can include a `branch`. E.g.:
+In the manifest, each project lists the environments to which code is deployed _in order of promotion_. Environments are defined by a `name` and `git` remote. E.g., a github repo for development and heroku apps for staging and production. Optionally, an environment can include `branch` or `hokusai` properties. E.g.:
 
     {
       "projects": {
@@ -53,5 +53,20 @@ To check all projects:
 
 At this time releasecop is not compatible with projects using [Heroku Pipelines](https://devcenter.heroku.com/articles/pipelines) to promote apps. For these apps, promoting a staging app to production simply copies the slug to the production app, so no git remote is updated.
 
+### Hokusai Pipelines
 
-Copyright (c) 2015 Joey Aghion, Artsy
+[Hokusai](https://github.com/artsy/hokusai) is a tool developed by Artsy for managing apps on [Kubernetes](https://kubernetes.io/). Releasecop's manifest can include environments with a `hokusai` property containing a docker image tag corresponding to the pipeline stage. (The `hokusai` executable and access to the image repository must be available locally.) E.g.:
+
+```json
+{
+    "test-api": [
+      {"name": "master", "git": "git@github.com:artsy/test-api.git" },
+      {"name": "staging", "git": "git@github.com:artsy/test-api.git", "hokusai": "staging"},
+      {"name": "production", "git": "git@github.com:artsy/test-api.git", "hokusai": "production"}
+    ]
+}
+```
+
+Releasecop will determine the git SHAs corresponding with each pipeline stage via the `hokusai registry images` command.
+
+Copyright (c) 2015-2018 Joey Aghion, Artsy

data/lib/releasecop/checker.rb

@@ -4,17 +4,17 @@ module Releasecop
 
     def initialize(name, envs)
       self.name = name
-      self.envs = envs
+      self.envs = envs.map { |e| ManifestItem.new(name, e) }
     end
 
     def check
       Dir.chdir(CONFIG_DIR) do
-        `git clone #{envs.first['git']} --bare #{name} > /dev/null 2>&1`
+        `git clone #{envs.first.git} #{'--bare' if envs.none?{|e| e.hokusai_tag }} #{name} > /dev/null 2>&1`
 
         Dir.chdir(name) do
           envs.each do |env|
-            `git remote add #{env['name']} #{env['git']} > /dev/null 2>&1`
-            `git fetch #{env['name']} > /dev/null 2>&1`
+            `git remote add #{env.name} #{env.git} > /dev/null 2>&1`
+            `git fetch #{env.name} > /dev/null 2>&1`
           end
 
           comparisons = []

data/lib/releasecop/comparison.rb

@@ -1,5 +1,5 @@
 class Comparison
-  attr_accessor :lines
+  attr_accessor :lines, :behind, :ahead
 
   def initialize(ahead, behind)
     @ahead = ahead
@@ -10,10 +10,6 @@ class Comparison
     @lines = log.lines
   end
 
-  def message
-    [summary_message, *detail_messages].join
-  end
-
   def unreleased?
     !lines.empty?
   end
@@ -21,42 +17,6 @@ class Comparison
   private
 
   def log
-    `git log #{from_rev}..#{to_rev} --pretty=format:"%h %ad %s (%an)" --date=short --no-merges`
-  end
-
-  def from_rev
-    [behind_name, behind_branch].join '/'
-  end
-
-  def to_rev
-    [ahead_name, ahead_branch].join '/'
-  end
-
-  def behind_name
-    @behind['name']
-  end
-
-  def behind_branch
-    @behind['branch'] || 'master'
-  end
-
-  def ahead_name
-    @ahead['name']
-  end
-
-  def ahead_branch
-    @ahead['branch'] || 'master'
-  end
-
-  def summary_message
-    if unreleased?
-      "  #{behind_name} is behind #{ahead_name} by:\n"
-    else
-      "  #{behind_name} is up-to-date with #{ahead_name}"
-    end
-  end
-
-  def detail_messages
-    lines.map { |l| "    #{l}" }
+    `git log #{@ahead.for_rev_range}..#{@behind.for_rev_range} --pretty=format:"%h %ad %s (%an)" --date=short --no-merges`
   end
 end

data/lib/releasecop/manifest_item.rb

@@ -0,0 +1,28 @@
+class ManifestItem
+  attr_reader :git, :branch, :name, :hokusai_tag
+
+  def initialize(repo_name, item)
+    @repo_name = repo_name
+    @git = item['git']
+    @name = item['name']
+    @branch = item['branch'] || 'master'
+    @hokusai_tag = item['hokusai']
+  end
+
+  def for_rev_range
+    @sha ||= find_hokusai_sha if @hokusai_tag
+    @sha || [@name, @branch].join('/')
+  end
+
+  private
+
+  def working_dir
+    "#{@repo_name}-#{@name}-working"
+  end
+
+  def find_hokusai_sha
+    images_output = `hokusai registry images`
+    tags = images_output.lines.grep(/\d{4}.* | .* | .*/).map{|l| l.split(' | ').last.split(',').map(&:strip)}
+    tags.detect{|t| t.include?(@hokusai_tag) }.detect{|t| t[/^[0-9a-f]{40}$/]}
+  end
+end

data/lib/releasecop/result.rb

@@ -31,6 +31,14 @@ class Result
   end
 
   def comparison_messages
-    @comparisons.map &:message
+    @comparisons.map do |comparison|
+      summary = if comparison.unreleased?
+        "  #{comparison.behind.name} is behind #{comparison.ahead.name} by:\n"
+      else
+        "  #{comparison.behind.name} is up-to-date with #{comparison.ahead.name}"
+      end
+      detailed_messages = comparison.lines.map { |l| "    #{l}" }
+      [summary, *detailed_messages].join
+    end
   end
 end

data/lib/releasecop/version.rb

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

data/lib/releasecop.rb

@@ -2,6 +2,7 @@ require "releasecop/version"
 require 'thor'
 require 'shellwords'
 require 'json'
+require 'releasecop/manifest_item'
 require "releasecop/comparison"
 require "releasecop/result"
 require "releasecop/checker"

data/releasecop.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releasecop
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joey Aghion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - joey@aghion.com
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,6 +85,7 @@ files:
 - lib/releasecop/checker.rb
 - lib/releasecop/cli.rb
 - lib/releasecop/comparison.rb
+- lib/releasecop/manifest_item.rb
 - lib/releasecop/result.rb
 - lib/releasecop/version.rb
 - releasecop.gemspec
@@ -93,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Given a list of projects and environments pipelines, report which environments