peacock 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ea91580dc4505136482f503da3b8bc0fb36749
-  data.tar.gz: 1feb55166e087b89c66fa7684debe05f636b1070
+  metadata.gz: 33e4a22c408e35b4468b963ed395cb1eefd3dda9
+  data.tar.gz: 911e6d77543c8bfa6a65ddd62ea2dc5347e9d041
 SHA512:
-  metadata.gz: 7356035129eec6ba016805660e380f278cab400e7e22f047dbbed419e7ade6402372eec6bd680e96f4076d3d69933555f1b3ad23c9584d4406ec64522739d582
-  data.tar.gz: 28e4d4a38b0a25b201b6374146bfb807af7bba7d16ba87599b0c3b1dce0781e85676dad571b117c8ef602e2649aee69130c18a8b3b72395633314b0794d0d5b7
+  metadata.gz: a94e7f27752af85eab92a233cdd265571e8c41da79081f75166491f48070ddcd7eedd0aafabb9fb593661eda98fa5564cf9e3a2973eabb8eb9e65eb752b39645
+  data.tar.gz: 95ce5a06d6714f5e9120d04ace27c7d0285f010468c41625c45711dd6f7ff04314d196afe2c4f2544c6150236cb5c6ed0c5b4b57e0c3ce13c316c4ac483bdc4e

data/README.md

@@ -2,11 +2,7 @@
 
 Peacock is a small tool to easily manage your .gitignore written in ruby.
 
-It lets you ignore and extract files and directories using .gitignore in your current git repository.
-
-Note that while ignoring files and directories peacock will perform safety commits to make sure your work is not lost. It will commit all your uncommited work (if there is any) before and after adding files to .gitignore.
-
-While extracting, peacock leaves everything untouched.
+It lets you extract files and directories from .gitignore files as well as inserting new files to .gitignore
 
 Note that at the moment you can't combine options with one hyphen (e.g.: -ev for --extract and --verbose) but you have to pass them separated (e.g.: -e -v)
 
@@ -26,7 +22,7 @@ Options:
 
     -h, [--help]        # show this text
     -r, [--root]        # use root .gitignore
-    -v, [--verbose]     # surpress output
+    -s, [--silent]      # suppress output
     -e, [--extract]     # extract file from .gitignore
 
 ## Example
@@ -44,8 +40,10 @@ Options:
     added some to .gitignore
     
     $ git status
-    On branch master
-    nothing to commit, working directory clean
+    ...
+    Untracked files:
+        these
+        files
     
     $ peacock -e are
     removed are from .gitignore
@@ -53,15 +51,14 @@ Options:
     $ git status
     ...
     Untracked files:
+        these
 	    are
+	    files
 
     
 ## TODO
 
-- add functionalities
-- custom commit messages
-- comments in .gitignore
-- options can't be combined (e.g. -ev for extract and surpress)
+Issues are used for TODOs
 
 ## Contributing
 

data/lib/git.rb

@@ -38,6 +38,10 @@ module Git
   def self.commit_all(message)
     Git::Lib.commit_all(message)
   end
+
+  def self.remove_from_cache(file)
+    Git::Lib.remove_from_cache(file)
+  end
   
   def self.clear_cache
     Git::Lib.clear_cache

data/lib/git/lib.rb

@@ -23,6 +23,10 @@ module Git
     def self.clear_cache
       Git::Base.command_output('rm', '-r --cached .')
     end
+
+    def self.remove_from_cache(path)
+      Git::Base.command_output('rm', "-rf --cached #{path}")
+    end
     
     def self.log
       Git::Base.command_output('log')

data/lib/peacock/cli.rb

@@ -50,13 +50,13 @@ module Peacock
         Options:
           \t-h, [--help]           # show this text
           \t-r, [--root]           # use root .gitignore
-          \t-v, [--verbose]        # surpress output
+          \t-s, [--silent]         # surpress output
           \t-e, [--extract]        # extract file from .gitignore
       EOF
     end
     
     def options
-      %w(-r --root -e --extract -v --verbose)
+      %w(-r --root -e --extract -s --silent)
     end
     
   end

data/lib/peacock/cli_hash.rb

@@ -40,8 +40,8 @@ module Peacock
       opts.include?('-r') || opts.include?('--root')
     end
     
-    def verbose?
-      opts.include?('-v') || opts.include?('--verbose')
+    def silent?
+      opts.include?('-s') || opts.include?('--silent')
     end
     
     def engine

data/lib/peacock/engine/extractor.rb

@@ -12,7 +12,7 @@ module Peacock
       
       def initialize(opt_hash)
         @hash = check_and_return_hash(opt_hash)
-        @logger = Peacock::Logger.new(@hash.verbose?)
+        @logger = Peacock::Logger.new(@hash.silent?)
         path = determine_git_ignore_path
         git_ignore_exists?(path)
 

data/lib/peacock/engine/ignorer.rb

@@ -12,16 +12,13 @@ module Peacock
     
       def initialize(opt_hash)
         @hash = check_and_return_hash(opt_hash)
-        @logger = Peacock::Logger.new(@hash.verbose?)
+        @logger = Peacock::Logger.new(@hash.silent?)
         path = determine_git_ignore_path
         @git_ignore = File.open(path, 'a+')
       end
     
       def workflow
-        Git.commit_all('peacock: before .gitignore commit')
         ignore_files_and_directories
-        Git.clear_cache
-        Git.commit_all('peacock: after .gitignore commit')
         @git_ignore.close
       end
     
@@ -44,10 +41,9 @@ module Peacock
     
       def check_and_write(str)
         unless entry_exists?(str)
-          @git_ignore.write(str + "\n")
-          @logger.ignore(str)
+          insert_in_gitignore(str)
         end
-      
+
         @git_ignore.rewind
       end
     
@@ -57,6 +53,21 @@ module Peacock
         end
         false
       end
+
+      def insert_in_gitignore(str)
+        @git_ignore.write(str + "\n")
+        Git.remove_from_cache(prepare_arg(str))
+        @logger.ignore(str)
+      end
+
+      # if directory then remove leading slash
+      def prepare_arg(str)
+        if str.start_with?('/')
+          str[1..-1]
+        else
+          str
+        end
+      end
     
     end
     

data/lib/peacock/logger.rb

@@ -2,16 +2,16 @@ module Peacock
   
   class Logger
   
-    def initialize(verbose)
-      @verbose = verbose
+    def initialize(silent)
+      @silent = silent
     end
     
     def ignore(string)
-      puts "added #{string} to .gitignore" unless @verbose
+      puts "added #{string} to .gitignore" unless @silent
     end
     
     def extract(string)
-      puts "removed #{string} from .gitignore" unless @verbose
+      puts "removed #{string} from .gitignore" unless @silent
     end
     
   end

data/lib/peacock/version.rb

@@ -1,3 +1,3 @@
 module Peacock
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peacock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christian Paling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Peacock is a small tool to easily manage your .gitignore