changi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d7fbfb1689d7effa8bed7d6ca6ca66073b6f31f
-  data.tar.gz: c436fe107d78b2479e66f578e0a92ba783eb3344
+  metadata.gz: cca32b966703139ad94bf778717d6710bfb80aac
+  data.tar.gz: 607d733dce85ede99d73368ba03e9ecb4284d26d
 SHA512:
-  metadata.gz: c4e10adc77fde7170e214922b6a9845f17a0af8d4b039bb53944076e424287e126c4236ca66480da5ebf0b46f9f5534a4b1135f86929808c36cbd71ec886da23
-  data.tar.gz: 0e8c75ba30d82a81ff03acfd492db5f8f3cd4abb75628ce3f85a15450722b748f0ab7c9d58201d09ed26d75b5fe626b4889ab49bcd859e9e8e4a17c6b6274ebf
+  metadata.gz: b6a866ca18edb40ed3f9911a8f02ea13cb732f213e6b37718048733bd5bf072a8585584e383a25b065dee8d169261a6fa6f6a37e4a838c91251f083438424de9
+  data.tar.gz: 653b5e814348386f29cf17725a88da47c6efe35f60777cf0054b79a97798dde907de05b2483f6ed6a86cb12de86baffe922c0b6be77a67c7e9673889a50a837e

data/lib/changi/configuration.rb

@@ -14,7 +14,7 @@ module Changi
         config.updater            = Updater::PrependUpdater
         config.changelog_template = <<-eod
 # <%= release.version %>, <%= Time.now.strftime('%Y-%m-%d') %><%= release.notes and ", \#{release.notes}" %>
-<% entry_set.entries_by_category.each do |category, entries| %>
+<% entry_set.entries.group_by(&:category).each do |category, entries| %>
 ## <%= category %>
 
 <%=

data/lib/changi/entry.rb

@@ -6,11 +6,11 @@ module Changi
 
     class << self
       def build entry_set, yaml_path
-        new(entry_set, yaml_path).tap &:read_in_attributes
+        new(entry_set, yaml_path).tap(&:read_in_attributes)
       end
 
       def load entry_set, yaml_path
-        new(entry_set, yaml_path).tap &:read_in_yaml
+        new(entry_set, yaml_path).tap(&:read_in_yaml)
       end
     end
 
@@ -34,9 +34,7 @@ module Changi
     end
 
     def destroy
-      unless system "git rm '#{@path}' >/dev/null 2>&1"
-        FileUtils.rm_f @path
-      end
+      git_rm || file_rm
     end
 
     private
@@ -44,5 +42,13 @@ module Changi
     def to_yaml
       self.class.attribute_names.map { |name| [name, send(name.to_sym)] }.to_h.to_yaml
     end
+
+    def git_rm
+      system "git rm '#{@path}' >/dev/null 2>&1"
+    end
+
+    def file_rm
+      FileUtils.rm_f @path
+    end
   end
 end

data/lib/changi/entry_set.rb

@@ -17,16 +17,12 @@ module Changi
       @entries ||= yamls.map { |yml| Entry.load self, yml }
     end
 
-    def entries_by_category
-      entries.group_by &:category
-    end
-
     def previous_categories
-      entries.map &:category
+      entries.map(&:category)
     end
 
     def destroy_all
-      entries.each &:destroy
+      entries.each(&:destroy)
     end
 
     private
@@ -40,10 +36,12 @@ module Changi
     end
 
     def make_entry_name
-      if git_branch = `git rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
-        "#{Time.now.strftime('%y%m%d%H%M%S')}_from_#{git_branch}.yml"
-      else
+      git_branch = `git rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
+
+      if git_branch.empty?
         "#{Time.now.strftime('%y%m%d%H%M%S')}.yml"
+      else
+        "#{Time.now.strftime('%y%m%d%H%M%S')}_from_#{git_branch}.yml"
       end
     end
   end

data/lib/changi/flexible_attributes.rb

@@ -14,7 +14,7 @@ module Changi
 
         attributes << {
           name: name,
-          reader: (block_given? ? block : ->(*args) { reader.new.read *args }),
+          reader: (block_given? ? block : ->(*args) { reader.new.read(*args) }),
           opts:   opts
         }
       end

data/lib/changi/reader/category_reader.rb

@@ -2,11 +2,11 @@ module Changi
   module Reader
     class CategoryReader < StringReader
       def read attribute, owner
-        fail 'CategoryReader can only be used for Entry attributes.' unless owner.is_a? Entry
+        raise 'CategoryReader can only be used for Entry attributes.' unless owner.is_a? Entry
 
         cli.say "#{attribute[:name].capitalize}:\n"
         cli.choose do |menu|
-          menu.choices *categories(owner.entry_set)
+          menu.choices(*categories(owner.entry_set))
           menu.choice 'Other (create new)' do
             cli.ask "Please insert #{attribute[:name]}:"
           end

data/lib/changi/reader/multiline_reader.rb

@@ -3,7 +3,7 @@ require 'tempfile'
 module Changi
   module Reader
     class MultilineReader
-      def read attribute, owner
+      def read attribute, _
         tmpfile = Tempfile.new 'changi'
 
         intro tmpfile, attribute
@@ -28,8 +28,8 @@ module Changi
         tmpfile.puts
         tmpfile.puts
         tmpfile.puts "# Please enter #{attribute[:name]} above."
-        tmpfile.puts "# Lines starting with # will be ignored."
-        tmpfile.puts "# Empty tmpfile will abort the process." if attribute[:opts][:required]
+        tmpfile.puts '# Lines starting with # will be ignored.'
+        tmpfile.puts '# Empty tmpfile will abort the process.' if attribute[:opts][:required]
         tmpfile.sync
         tmpfile.close
       end
@@ -42,7 +42,7 @@ module Changi
 
       def editor
         editor_tests.lazy.map(&:call).find { |e| !(e.nil? || e.empty?) }.tap do |e|
-          fail 'could not detect editor' unless e
+          raise 'could not detect editor' unless e
         end
       end
 

data/lib/changi/reader/string_reader.rb

@@ -3,7 +3,7 @@ require 'highline'
 module Changi
   module Reader
     class StringReader
-      def read attribute, owner
+      def read attribute, _
         cli.ask("#{attribute[:name]}: ").tap do |x|
           if attribute[:opts][:required] && [nil, ''].include?(x)
             abort "required #{attribute[:name]} attribute empty, abort"

data/lib/changi/release.rb

@@ -4,7 +4,7 @@ module Changi
 
     class << self
       def build
-        new.tap &:read_in_attributes
+        new.tap(&:read_in_attributes)
       end
 
       def demo

data/lib/changi/renderer.rb

@@ -6,7 +6,7 @@ module Changi
     attr_reader :release
 
     def initialize config, entry_set, release
-      @config  = config
+      @config    = config
       @entry_set = entry_set
       @release   = release
     end

data/lib/changi/updater/prepend_updater.rb

@@ -2,7 +2,7 @@ module Changi
   module Updater
     class PrependUpdater
       def update changelog_path, release_data
-        previous = File.read changelog_path if File.exists? changelog_path
+        previous = File.read changelog_path if File.exist? changelog_path
 
         File.open changelog_path, 'w' do |fd|
           fd.puts release_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mobisol GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,7 +58,7 @@ files:
 - lib/changi/renderer.rb
 - lib/changi/tasks.rb
 - lib/changi/updater/prepend_updater.rb
-homepage: https://github.org/plugintheworld/changi
+homepage: https://github.com/plugintheworld/changi
 licenses:
 - MIT
 metadata: {}