emoji-commit 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f3625b16774bf7e5973fc05a4f2f62ef44c7295
-  data.tar.gz: f2aa97f9856cf0cb77351ee6eaebf2b01cad498b
+  metadata.gz: 6e8442d08642c4a17864ba0de7f3bfde68f04692
+  data.tar.gz: 66e96992e26606e6c396fbd190da68096c09b85c
 SHA512:
-  metadata.gz: 913a37d092a19b5e6ffed1bd3f160d95d31673b5188bc9a82e61db196fb5db0f140b1521cf95dcf76750b4ed6cdc264904b63be2801808dccec839581abc7b04
-  data.tar.gz: 877117da81859dbbd46cf1d2cab3e27ccf52225613d4d9a5936b9a7b4f5404a8236330c92a27bbb2dc55ba51dfcd2e8c6c63fc275802740fb30da2608b659932
+  metadata.gz: f478065868a1b5cd43e5ca72f6336472b9b40d65eb3fa19ef67844c341673a85e162901c250b11e43398a929fc03d7fe7bd791f345689896bdaedfedbcaa8cb9
+  data.tar.gz: 4074f2f64324c8e45b18fd731a9186e87f787398fc39e18e2b3e6a5aaffe474e155461887f075ac1db9dc323380c75cd61f8b0a3823af0c9ffadc57e468d6e9c

data/README.md

@@ -56,3 +56,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/claire
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
+## :crystal_ball: Meta
+
+On Ruby gems: [emoji-commit](https://rubygems.org/gems/emoji-commit)
+

data/TODO.md

@@ -8,17 +8,18 @@ Pull requests welcome
 * ~~Add specs for get_emoji~~
 * ~~Rename emoji-commit-msg class and methods~~
 * ~~Print message on successful install~~
-* Print message on unsuccessful install/exit
-* Refactor and rename file-tasks
 * ~~Ask whether they want to install~~
-* Test asking whether they want to install
-* Test all bundle exec Thor stuff
+* ~~Add SimpleCov~~
+* ~~Refactor file-tasks~~
+* ~~Test asking whether they want to install~~
+* ~~Prompt user through install~~
+* ~~Add uninstall scripts method~~
+* ~~Uninstall fails if file not there~~
+* Print message on unsuccessful install/exit
 * Check Fileutils.cp is OK if file already exists
-* Add a rescue in to file-tasks
 * Can you do skin tone modifiers in Git emojis?
   * Add support for this if yes
-* Prompt user through install
-* Add uninstall scripts method
-* Add SimpleCov
-* Spec for file-tasks
-* Add colours to prompt messages
+* Spec for file-tasks FileUtils methods
+* Add colours to prompt messages
+* Better Readme - more emojis
+* Improve that terrible attempt at instance methods in file-tasks

data/emoji-commit.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'fakefs'
 end

data/lib/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/lib/emoji-commit-version.rb

@@ -1,3 +1,3 @@
 module EmojiCommit
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/file-tasks.rb

@@ -4,14 +4,11 @@ require 'thor'
 
 module EmojiCommit
   class Cli < Thor
-    desc 'install', 'installs commit hook scripts'
 
+    desc 'install', 'installs commit hook scripts'
     def install
-      unless Dir.exist?('.git')
-        puts 'Git has not been initialised in this directory. Bye'
-        exit
-      end
-
+      check_for_git
+      
       puts 'You are about to overwrite any existing Git commit hook with the emoji script'
       puts 'Is that OK? (y|n)'
       
@@ -28,23 +25,58 @@ module EmojiCommit
       end
 
       if File.exist?('.git/hooks/commit-msg') then FileUtils.rm('.git/hooks/commit-msg') end
-      if File.exist?('.git/hooks/commit-msg.sample') then FileUtils.rm('.git/hooks/commit-msg.sample') end
 
-      path = path_to_resources
-
-      FileUtils.cp(path + '/emoji-script.rb', '.git/hooks/emoji-script.rb')
-      FileUtils.cp(path + '/emoji-commit-msg.rb', '.git/hooks/emoji-commit-msg.rb')
-      FileUtils.cp(path + '/commit-msg', '.git/hooks/commit-msg')
-      FileUtils.cp(path + '/assets/emojis.json', '.git/hooks/emojis.json')
-      FileUtils.chmod 0755, %w(.git/hooks/emoji-script.rb .git/hooks/emoji-commit-msg.rb .git/hooks/commit-msg .git/hooks/emojis.json)
-      
+      filenames.each do |filename|
+        FileUtils.cp("#{path}/#{filename}", ".git/hooks/#{filename}")
+        FileUtils.chmod(0755, ".git/hooks/#{filename}")
+      end
+            
       puts 'Installed scripts successfully. Commit emoji-ful messages!'
     end
 
+    desc 'uninstall', 'uninstalls commit hook scripts and restores sample script'
+    def uninstall
+      check_for_git
+
+      puts 'You are about to uninstall the emoji Git commit hook'
+      puts 'Is that OK? (y|n)'
+
+      answer = STDIN.gets.strip.downcase
+
+      if answer == 'n'
+        puts 'Good choice. Bye'
+        exit
+      elsif answer != 'y'
+        puts 'Pardon? Oh who cares. Bye'
+        exit
+      else
+        puts 'As long as you\'re sure :( Removing files now'
+      end
+
+      filenames.each do |filename|
+        FileUtils.rm(".git/hooks/#{filename}") if File.exists?(".git/hooks/#{filename}")
+      end
+
+      FileUtils.cp("#{path}/commit-msg.sample", ".git/hooks/commit-msg.sample") unless File.exist?('.git/hooks/commit-msg.sample')
+
+      puts 'Uninstalled scripts successfully. Enjoy your boring emoji-less life.'
+    end
+
     no_commands do
-      def path_to_resources
+      def check_for_git
+        unless Dir.exist?('.git')
+          puts 'Git has not been initialised in this directory. Bye'
+          exit
+        end
+      end
+
+      def path
         File.dirname(File.expand_path(__FILE__))
       end
+
+      def filenames
+        ['emoji-script.rb', 'emoji-commit-msg.rb', 'commit-msg', 'emojis.json']
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emoji-commit
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Claire Parker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  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: Prefixes Git commit messages with a random GitHub-friendly emoji.
 email:
 - claire.parker87@gmail.com
@@ -102,11 +116,12 @@ files:
 - bin/emoji
 - bin/setup
 - emoji-commit.gemspec
-- lib/assets/emojis.json
 - lib/commit-msg
+- lib/commit-msg.sample
 - lib/emoji-commit-msg.rb
 - lib/emoji-commit-version.rb
 - lib/emoji-script.rb
+- lib/emojis.json
 - lib/file-tasks.rb
 homepage: https://github.com/claireparker/emoji-commit
 licenses:
@@ -128,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Adds an emoji to your commit message