rusky 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a00a714408281d031099446610b64c09660f508b
-  data.tar.gz: fba6ebd6126cb2381e0663143261f1af85f2355f
+  metadata.gz: a2481de2ebd82496ba818a663ad9939ca9bf62bf
+  data.tar.gz: 96c97ed651c2317205e24851be6ca21044f8d828
 SHA512:
-  metadata.gz: 07b16db70461073fbc0791f5476aa81ec92b89e23477d3165b49820216bdbe7f8f0858ee6246ce526b7f1fe8cb3b87e4d6b1866380805626fa7afd561bae2fde
-  data.tar.gz: 84c6e65a3bc61ef46162fa58e12e20abbf5773674da0d2381ff210a0b415ef8fdecbd270cd44fa7c40fa1b590f4b1be6f5724dff4390e22c150007e486c753c1
+  metadata.gz: ad6a71c3a2c76724f35a796f04222c54e8b84d67d5078ddc34553c3ccc3e1b3ee47265e6c48b445035c7f1ef02627aac17ae6a9e314363f387fb7cc8cf1962f0
+  data.tar.gz: b6ac28dd6aaca658bb5c9d60d455c62b8d195f55c9912d40c667f2e98b8ca4ffa6d14d80a08d47bc6166acaee100b07ccc359d9cffc438c80553946919eeef15

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.4
+  - 2.4.4
+  - 2.5.1
 script:
   - bundle exec rspec

data/lib/rubygems_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "rusky"
 

data/lib/rusky.rb

@@ -1,134 +1,50 @@
-require 'rusky/version'
 require 'rusky/cli'
+require 'rusky/hook'
+require 'rusky/hooks'
+require 'rusky/setting'
+require 'rusky/version'
 require 'yaml'
 require 'fileutils'
 
 module Rusky
-  HOOKS = %w[
-    applypatch-msg
-    pre-applypatch
-    post-applypatch
-    pre-commit
-    prepare-commit-msg
-    commit-msg
-    post-commit
-    pre-rebase
-    post-checkout
-    post-merge
-    pre-push
-    pre-receive
-    update
-    post-receive
-    post-update
-    push-to-checkout
-    pre-auto-gc
-    post-rewrite
-    sendemail-validate
-  ].freeze
-
   def self.install
-    cwd = `lsof -p #{Process.ppid} | grep cwd`.split(" ").last
+    cwd = current_work_directory_name
 
-    git_path = File.join(cwd, '.git')
-    if !File.exists? git_path
-      puts "can't find .git directory, skipping Git hooks installation"
+    unless processable?(cwd)
+      puts "rusky > can't find .git directory, so skipping rusky process"
       return
     end
 
-    hook_path = File.join(git_path, 'hooks')
-    if !File.exists? hook_path
-      FileUtils.mkdir_p hook_path
-    end
+    Rusky::Hooks.new(cwd).create
+    Rusky::Setting.new(cwd).create
 
-    HOOKS.each do |hook_name|
-      create_hook(hook_name, hook_path, cwd)
-    end
-
-    rusky_setting_file_path = File.join(cwd, '.rusky')
-    if !File.exists? rusky_setting_file_path
-      File.write(rusky_setting_file_path, '')
-    end
+    puts "rusky > installation is done. enjoy!"
   rescue => e
-    puts "unexpected error happened: #{e.inspect}"
-  end
-
-  def self.create_hook(hook_name, hook_path, cwd)
-    script = get_hook_script(hook_name, cwd)
-    filename = File.join(hook_path, hook_name)
-
-    if File.exists? filename
-      if File.read(filename).include? 'rusky'
-        # Overwrite
-        write(filename, script)
-      else
-        # Keep user original Git hook
-      end
-    else
-      write(filename, script)
-    end
-  end
-
-  def self.write(filename, script)
-    File.write filename, script
-    FileUtils.chmod(0755, filename)
+    puts "rusky > unexpected error happened: #{e.inspect}"
   end
 
-  def self.get_hook_script(hook_name, cwd)
-    no_verify_message = if hook_name == 'prepare-commit-msg'
-                          '(cannot be bypassed with --no-verify due to Git specs)'
-                        else
-                          '(add --no-verify to bypass)'
-                        end
-
-    rake_task_name = "rusky:#{hook_name.gsub('-', '_')}"
-
-    <<~EOS
-      #!/bin/sh
-      #rusky #{Rusky::VERSION}
-      has_hook_script () {
-        [ -f .rusky ] && cat .rusky | grep -q "$1:"
-      }
-      cd "#{cwd}"
-      # Check if #{hook_name} script is defined, skip if not
-      has_hook_script #{hook_name} || exit 0
-
-      # Export Git hook params
-      export GIT_PARAMS="$*"
-      # Run command
-      echo "rusky > #{hook_name} Git hook is running"
-      echo "rusky > bundle exec rake #{rake_task_name}"
-      echo
-      bundle exec rake #{rake_task_name} || {
-        echo
-        echo "rusky > #{hook_name} Git hook failed #{no_verify_message}"
-        exit 1
-      }
-    EOS
-  end
-
-
   def self.uninstall
-    cwd = `lsof -p #{Process.ppid} | grep cwd`.split(" ").last
+    cwd = current_work_directory_name
 
-    HOOKS.each do |hook_name|
-      remove_hook(cwd, hook_name)
+    unless processable?(cwd)
+      puts "rusky > can't find .git directory, so skipping rusky process"
+      return
     end
 
-    rusky_setting_file_path = File.join(cwd, '.rusky')
-    if File.exists? rusky_setting_file_path
-      File.delete(rusky_setting_file_path)
-      puts "rusky > removing .rusky file..."
-    end
+    Rusky::Hooks.new(cwd).delete
+    Rusky::Setting.new(cwd).delete
 
-    puts "rusky > uninstall is done. please remove rake tasks for rusky if you have them"
+    puts "rusky > uninstallation is done. please remove rake tasks for rusky if you have them"
     puts "rusky > Thank you for using rusky!"
+  rescue => e
+    puts "rusky > unexpected error happened: #{e.inspect}"
   end
 
-  def self.remove_hook(cwd, hook_name)
-    filename = File.join(cwd, '.git', 'hooks', hook_name)
-    if File.exists?(filename) && File.read(filename).include?('rusky')
-      puts "rusky > removing #{hook_name} hook script..."
-      File.delete(filename)
-    end
+  def self.current_work_directory_name
+    `lsof -p #{Process.ppid} | grep cwd`.split(" ").last
+  end
+
+  def self.processable?(cwd)
+    File.exists? File.join(cwd, '.git')
   end
 end

data/lib/rusky/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rusky'
 require 'thor'
 

data/lib/rusky/hook.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'rake'
+require 'yaml'
+require 'fileutils'
+
+module Rusky
+  class Hook
+    include Rake::DSL if defined? Rake::DSL
+
+    attr_reader :hook_name, :cwd, :filename, :setting
+
+    def initialize(hook_name, cwd, setting=nil)
+      @hook_name = hook_name
+      @cwd = cwd
+      @filename = File.join(@cwd, '.git', 'hooks', hook_name)
+      @setting = setting
+    end
+
+    def create
+      if !exists?
+        puts "rusky > creating #{hook_name} hook script..."
+        write
+      else
+        if is_rusky_hook?
+          puts "rusky > overwriting #{hook_name} hook script because also existing one is created by rusky."
+          write
+        else
+          puts "rusky > skip creating #{hook_name} hook script because existing one is created by you or other tool."
+        end
+      end
+      self
+    end
+
+    def delete
+      if !exists?
+        puts "rusky > skip deleting #{hook_name} hook script since there is no git hook file."
+      else
+        if is_rusky_hook?
+          puts "rusky > removing #{hook_name} hook script..."
+          File.delete(filename)
+        else
+          puts "rusky > skip deleting #{hook_name} hook script because existing one is created by you or other tool."
+        end
+      end
+      self
+    end
+
+    def define_task
+      # prioritize existing user hook
+      if Rake::Task.task_defined? rake_task_name
+        puts "rusky > skip creating a new rake task since the task for #{hook_name} is already defined."
+        return
+      end
+
+      commands = setting&.commands_for hook_name
+
+      task "#{rake_task_name}" do
+        if commands.empty?
+          puts "rusky > No command for #{hook_name} is defined in .rusky file"
+          next
+        end
+
+        commands.each do |command|
+          puts "rusky > #{command}"
+          system(command) || raise("rusky > #{command} failed")
+        end
+      end
+    end
+
+    private
+
+    def rake_task_name
+      @rake_task_name ||= "rusky:#{hook_name.gsub('-', '_')}"
+    end
+
+    def exists?
+      @exists ||= File.exists?(filename)
+    end
+
+    def is_rusky_hook?
+      @is_rusky_hook ||= exists? && File.read(filename).include?('rusky')
+    end
+
+    def write
+      File.write filename, hook_script
+      FileUtils.chmod(0755, filename)
+    end
+
+    def no_verify_message
+      can_bypass? ? '(add --no-verify to bypass)' : '(cannot be bypassed with --no-verify due to Git specs)'
+    end
+
+    def can_bypass?
+      hook_name != 'prepare-commit-msg'
+    end
+
+    def hook_script
+      <<~EOS
+        #!/bin/sh
+        #rusky #{Rusky::VERSION}
+        has_hook_script () {
+          [ -f .rusky ] && cat .rusky | grep -q "$1:"
+        }
+        cd "#{cwd}"
+        # Check if #{hook_name} script is defined, skip if not
+        has_hook_script #{hook_name} || exit 0
+
+        # Export Git hook params
+        export GIT_PARAMS="$*"
+        # Run command
+        echo "rusky > #{hook_name} Git hook is running"
+        echo "rusky > bundle exec rake #{rake_task_name}"
+        echo
+        bundle exec rake #{rake_task_name} || {
+          echo
+          echo "rusky > #{hook_name} Git hook failed #{no_verify_message}"
+          exit 1
+        }
+      EOS
+    end
+  end
+end
+

data/lib/rusky/hooks.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'rusky'
+require 'rusky/hook'
+require 'fileutils'
+
+module Rusky
+  class Hooks
+    DIR_NAME = 'hooks'
+
+    HOOK_NAMES = %w[
+      applypatch-msg
+      pre-applypatch
+      post-applypatch
+      pre-commit
+      prepare-commit-msg
+      commit-msg
+      post-commit
+      pre-rebase
+      post-checkout
+      post-merge
+      pre-push
+      pre-receive
+      update
+      post-receive
+      post-update
+      push-to-checkout
+      pre-auto-gc
+      post-rewrite
+      sendemail-validate
+    ].freeze
+
+    attr_reader :cwd, :dir_name, :hooks
+
+    def initialize(cwd, setting=nil)
+      @cwd = cwd
+      @dir_name = File.join(cwd, '.git', 'hooks')
+      @hooks = HOOK_NAMES.map { |hook_name| Rusky::Hook.new(hook_name, cwd, setting) }
+    end
+
+    def create
+      mkdir unless exists?
+      hooks.each(&:create)
+    end
+
+    def delete
+      return unless exists?
+      hooks.each(&:delete)
+    end
+
+    def define_tasks
+      hooks.each(&:define_task)
+    end
+
+    private
+
+    def exists?
+      @exists ||= File.exists? dir_name
+    end
+
+    def mkdir
+      FileUtils.mkdir_p dir_name
+    end
+  end
+end

data/lib/rusky/setting.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Rusky
+  class Setting
+    attr_reader :cwd, :filename
+
+    FILENAME = '.rusky'
+
+    def initialize(cwd)
+      @cwd = cwd
+      @filename = File.join(@cwd, FILENAME)
+      @yaml = exists? ? YAML.load_file(filename) : Hash.new([])
+    end
+
+    def create
+      if !exists?
+        puts "rusky > creating .rusky file..."
+        File.write(filename, '')
+      end
+      self
+    end
+
+    def delete
+      if exists?
+        puts "rusky > deleting .rusky file..."
+        File.delete(filename)
+      end
+      self
+    end
+
+    def commands_for(hook_name)
+      @yaml[hook_name]
+    end
+
+    private
+
+    def exists?
+      @exists ||= File.exists? filename
+    end
+  end
+end
+

data/lib/rusky/task.rb

@@ -1,11 +1,10 @@
-require 'rake'
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rusky'
 
 module Rusky
   class Task
-    include Rake::DSL if defined? Rake::DSL
-
     class << self
       def install(base=nil)
         new(base).install
@@ -13,36 +12,12 @@ module Rusky
     end
 
     def initialize(base=nil)
-      @base = base || `lsof -p #{Process.ppid} | grep cwd`.split(" ").last
-      rusky_setting_file_path = File.join(@base, '.rusky')
-      @yaml = File.exists?(rusky_setting_file_path) ? YAML.load_file(File.join(@base, '.rusky')) : Hash.new([])
+      @cwd = base || Rusky.current_work_directory_name
     end
 
     def install
-      Rusky::HOOKS.each do |hook_name|
-        rake_task_name = "rusky:#{hook_name.gsub('-', '_')}"
-
-        # prioritize existing user hook
-        next if Rake::Task.task_defined? rake_task_name
-
-        define_task hook_name, rake_task_name
-      end
-    end
-
-    def define_task(hook_name, rake_task_name)
-      task "#{rake_task_name}" do
-        commands = @yaml[hook_name]
-
-        if commands.empty?
-          puts "rusky > No command for #{hook_name} is defined in .rusky file"
-          next
-        end
-
-        commands.each do |command|
-          puts "rusky > #{command}"
-          system(command) || raise("rusky > #{command} failed")
-        end
-      end
+      setting = Rusky::Setting.new(@cwd)
+      Rusky::Hooks.new(@cwd, setting).define_tasks
     end
   end
 end

data/lib/rusky/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rusky
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusky
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Masato Ohba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,6 +101,9 @@ files:
 - lib/rubygems_plugin.rb
 - lib/rusky.rb
 - lib/rusky/cli.rb
+- lib/rusky/hook.rb
+- lib/rusky/hooks.rb
+- lib/rusky/setting.rb
 - lib/rusky/task.rb
 - lib/rusky/version.rb
 - rusky.gemspec