make_release 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbb23cdf86da813754fd4e9c9a91a152ee45600
-  data.tar.gz: ac4a0c3b38dc3015566c298ed0120eae68cbf81e
+  metadata.gz: c8ad20920bcb4dc6f1ff4650fbba7cdc47c293df
+  data.tar.gz: fb4189046c3fde04e76c88ce9f7fb934f22ece3c
 SHA512:
-  metadata.gz: bdc3e3cc59912ed6ed74b017b6335f3ff23692142e40ba21d090aedeb6d12b6f26f440bc17dad7fe2f7ca5ca3c5efca2b17936be600d8a0f03c744816de43d9c
-  data.tar.gz: d663f98969f8810629ecb41aed8df0a8fd57c7e61d367827be19a2fa96663a98ae29f757fddd6b8e7a0fb91004b1c634250cc5b922fe59995ad733f71b368f02
+  metadata.gz: 6036c7b2f5e75c0b98a5b13e2e05c70ca5721dbe6a468a6c2fb9d9e66b85d4fa688452217a460e141daa51b9e6f6a34a0134edd67367914f34413c833ea0e6bb
+  data.tar.gz: 78948f0991ac3ae3737bd66522637c9d41095ca147d255d66cde5e6adc6c863942329f9357392a35c819a4a8baacec310d2dfb7e6161fba64c399e195683b36f

data/lib/make_release/git.rb

@@ -1,17 +1,31 @@
 require 'open3'
 
 module MakeRelease
-  module Git
+  class Git
 
-    def self.log(dir, branch)
-      cmd = "git log --no-merges --pretty='%H|%s' #{branch}"
-      Open3.popen3(cmd, chdir: dir) do |i,o,e,t|
-        if t.value != 0
-          raise RuntimeError, "Unable to obtain gitlog for #{branch} in #{dir}"
-        end
+    def initialize(dir = '.')
+      raise StandardError, "Directory '#{dir}' is not valid" unless Dir.exist?(dir)
+      raise RuntimeError, "Doesn't look like '#{dir}' is a Git repository" unless Dir.exist?(File.join(dir, '.git'))
+
+      @working_dir = dir
+    end
+
+    def log(branch)
+      raise RuntimeError, "Invalid branch: #{branch}" unless branch_valid? branch
+      run_command("git log --no-merges --pretty='%H|%s' #{branch}")
+    end
+
+    def branch_valid?(branch)
+      run_command("git branch --list #{branch}")[0] =~ /#{branch}/
+    end
+
+    private
+
+    def run_command(cmd)
+      Open3.popen3(cmd, chdir: @working_dir) do |i, o, e, t|
+        raise RuntimeError, "Error on command: #{cmd}" if t.value != 0
         o.read.split("\n")
       end
     end
-
   end
 end

data/lib/make_release/globals.rb

@@ -2,7 +2,7 @@ module MakeRelease
   module Globals
     require 'yaml'
 
-    VERSION       = '0.1.1'
+    VERSION       = '0.2.0'
     IDENT         = 'make_release'
     BINIDENT      = 'mkrelease'
     AUTHOR        = 'Donovan C. Young'
@@ -11,6 +11,6 @@ module MakeRelease
     DESCRIPTION   = %q{Merges a list of JIRA stories from multiple branches into a release candidate}
     HOMEPAGE      = "https://github.com/dyoung522/#{IDENT}"
     LICENSE       = 'MIT'
-    VSTRING       = "#{IDENT} v.#{VERSION} - #{AUTHOR}, 2015"
+    VSTRING       = "#{BINIDENT} v.#{VERSION} - #{AUTHOR}, 2015"
   end
 end

data/lib/make_release/options.rb

@@ -35,8 +35,7 @@ module MakeRelease
           if Dir.exist?(dir)
             options.directory = dir
           else
-            puts "Whoops: '#{dir}' is not a valid directory."
-            exit 2
+            raise RuntimeError, "ENOEXIST: Directory does not exist -> #{dir}"
           end
         end
 
@@ -64,7 +63,7 @@ module MakeRelease
 
         opts.on('-h', '--help', 'Show this message') { puts Globals::VSTRING + "\n\n"; puts opts;  exit 255; }
         opts.on('-V', '--version', 'Show version (and exit)') { puts Globals::VSTRING;  exit 255; }
-        opts.on('--diff', "Display a list of stories from all sources which haven't been merged into master") { options.diff = true }
+        opts.on('-D', '--diff', "Display a list of stories from all sources which haven't been merged into master") { options.diff = true }
         opts.on('--dryrun', %q{Don't actually modify any files, just show what would happen}) { options.dryrun = true }
         opts.on('--debug', 'Run with debugging options (use with caution)') { options.debug = true }
       end

data/lib/make_release/stories.rb

@@ -4,13 +4,13 @@ require 'make_release/git'
 module MakeRelease
   class Stories
 
-    def initialize( opts = Options.defaults )
-      @options   = opts
-      @stories   = opts[:stories]   || {}
+    def initialize(opts = Options.defaults)
+      @options = opts
+      @stories = opts[:stories] || {}
       @directory = opts[:directory] || '.'
-      @branches  = _get_branches(opts[:master], opts[:source])
+      @branches = _get_branches(opts[:master], opts[:source])
 
-      get_stories if @stories == {}
+      _get_stories if @stories == {}
     end
 
     attr_accessor :branches, :directory
@@ -23,13 +23,6 @@ module MakeRelease
       end
     end
 
-    def to_s
-      @stories.each do |branch, stories|
-        puts "#{branch.capitalize} -->"
-        stories.each { |s| puts s.to_s }
-      end
-    end
-
     def source
       @branches[1, @branches.size]
     end
@@ -41,13 +34,13 @@ module MakeRelease
     def master=(new_master)
       @stories[master] = []
       @branches[0] = new_master
-      get_stories(new_master)
+      _get_stories(new_master)
     end
 
     def shas
       source.map do |branch|
         stories[branch].map { |s| s.sha }
-      end.flatten
+      end.flatten.reverse
     end
 
     def source_stories
@@ -60,13 +53,15 @@ module MakeRelease
       story_index.values
     end
 
-    def add_story( branch, story )
+    def add_story(branch, story)
       (@stories[branch] ||= []).push story
     end
 
-    def find( branch, sha )
+    def find(branch, sha)
       raise ArgumentError, "Invalid environment #{branch}" unless @branches.include?(branch)
+
       @stories[branch].each { |story| return true if story.sha == sha }
+
       false
     end
 
@@ -91,9 +86,11 @@ module MakeRelease
       branches.flatten
     end
 
-    def get_stories(branches = @branches)
+    def _get_stories(branches = @branches)
+      git = Git.new(@directory)
+
       branches.to_a.each do |branch|
-        Git.log(@directory, branch).each do |line|
+        git.log(branch).each do |line|
           add_story branch, Story.new(line)
         end
       end

data/lib/make_release.rb

@@ -18,7 +18,12 @@ module MakeRelease
 
     puts opts.inspect if opts.debug
 
-    stories = Stories.new(opts)
+    begin
+      stories = Stories.new(opts)
+    rescue RuntimeError => error
+      puts error
+      exit 1
+    end
 
     puts stories.inspect if opts.debug
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_release
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Donovan C. Young