fgit 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f69edca87b9d1b9697e6154bc97600d7f011c0
-  data.tar.gz: d61c551f0cb7d57ae3ba2a7ad4a6290228925d7d
+  metadata.gz: 60fb839e06a3123640ed2bd5fef845f020758de8
+  data.tar.gz: 17b642ae884897efd0fc605deff626428cd69da2
 SHA512:
-  metadata.gz: 8ff16147e61fcc06fdee4080db2480bd9213b1e02a27c127a5ee3eddd92e2b2ed982ea6962e567424c4bc9d4dd6ae0cc3645e64936027a6ed2fe3a3a22783cad
-  data.tar.gz: d4ab1d6cf06f171e0bbd6ab4a8f152bcfb0e573c72330109e7e66d28d24dc1e7c5d4409b451b0dc831bdc11582e55575a491aa8f91869900b814262372b23ddd
+  metadata.gz: 4146815b302e415e82c35e55e96ec9db6619f9c2a01a8210c6caee49e72a00da0b53e05ff33fb1b2c65e38f9fecfd43227441980c23e03dab90e85830f08f888
+  data.tar.gz: a9b9a34aa56a0f595484b0f98b40ac2037657c3cd0cce218a2c5b17402db756a6c47295c55be36da37fcd7821288235bae1ef856644804fcf143a3ab969ce4bb

data/README.md

@@ -2,7 +2,7 @@
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/fgit`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
+This tool is just make command more easy to use for file manipulating from branch to branch base on git command
 
 ## Installation
 
@@ -22,16 +22,22 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+* list all relative file paths in given branch by a filename or a regular expression of filename
+* copy all files from given branch by a filename or a regular expression of filename
 
-## Development
+```
+Commands:
+  fgit ls BRANCH FILE_NAME
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+  fgit cp BRANCH FILE_NAME
+    with --force -f option: force to copy all files without confirm and ignore unstaged local changes
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
+Welcome any contrbutions to this project.
+
 1. Fork it ( https://github.com/[my-github-username]/fgit/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/fgit.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["yan_runchen"]
   spec.email         = ["chen_0_1987@sina.com"]
 
-  spec.summary       = %q{extend git for file manipulating from branch to branch}
-  spec.description   = %q{extend git for file manipulating from branch to branch}
+  spec.summary       = %q{make command more easy to use for file manipulating from branch to branch base on git command}
+  spec.description   = %q{make command more easy to use for file manipulating from branch to branch base on git command}
   spec.homepage      = "https://github.com/SmileZero/fgit"
   spec.license       = "MIT"
 

data/lib/fgit.rb

@@ -1,2 +1,6 @@
 require "fgit/version"
-require "fgit/cli"
+
+module Fgit
+  autoload :Common, "fgit/common"
+  autoload :CLI, "fgit/cli"
+end

data/lib/fgit/cli.rb

@@ -2,36 +2,44 @@ require "thor"
 
 module Fgit
   class CLI < Thor
+    include Common
+
     desc "ls BRANCH FILE_NAME", "list file in the given branch"
     def ls(source_branch=nil, file_name)
       branch = source_branch.nil? ? "HEAD" : "#{source_branch}"
-      command= "git ls-tree -r --name-only #{branch} | grep -E '^(.*/)*#{file_name}$'"
 
-      real_file_paths = `#{command}`
+      real_file_paths = `#{ls_command(branch, file_name)}`
 
       if real_file_paths.empty?
-        $stderr.puts "[Error] #{file_name} can not be found！<branch: #{source_branch}>"
+        $stderr.puts "[Error] #{file_name} can not be found！<branch: #{branch}>"
       else
         puts real_file_paths
       end
       real_file_paths
     end
 
-    desc "cp BRANCH FILE_NAME", "copy file from the given branch"
+    desc "cp BRANCH FILE_NAME", "copy file from the given branch, with --force -f option: force to copy all files"
+    method_option :force, :type => :boolean, :aliases => "-f"
     def cp(source_branch, file_name)
-      status = `git status -s`
-
-      unless status.empty?
-        $stderr.puts "[Warning] Please commit or stash your local changes."
-        $stderr.puts status
-        return
+      if !options[:force] && status = local_changes
+        puts "[Warning] There are unstaged local changes."
+        puts status
+        print "Copy files may override these changes. Continue? [yN]:"
+        return unless !!(STDIN.gets.chomp =~ /^\s*[yY]\s*$/)
       end
 
       real_file_paths = ls(source_branch, file_name)
+
+      if !options[:force]
+        file_count = real_file_paths.split.compact.size
+        file_string = file_count <= 1 ? "file" : "files"
+        print "Copy #{file_count} #{file_string} above to current branch? [yN]:"
+        return unless !!(STDIN.gets.chomp =~ /^\s*[yY]\s*$/)
+      end
+
       unless real_file_paths.empty?
-        copy_command = "git ls-tree -r --name-only #{source_branch} | grep -E '^(.*/)*#{file_name}$' | xargs git checkout #{source_branch}"
         puts "Handling..."
-        `#{copy_command}`
+        `#{cp_command(source_branch, file_name)}`
         puts "Done."
       end
     end

data/lib/fgit/common.rb

@@ -0,0 +1,26 @@
+module Fgit
+  module Common
+    private
+
+    def local_changes
+      status = `git status -s`
+
+      return nil if status.empty?
+      status
+    end
+
+    def ls_command(branch, file_name)
+      ls_commands = []
+      ls_commands << "git ls-tree -r --name-only #{branch}"
+      ls_commands << "grep -E '^(.*/)*#{file_name}$'"
+      ls_commands.join("|")
+    end
+
+    def cp_command(branch, file_name)
+      cp_commands = []
+      cp_commands << ls_command(branch, file_name)
+      cp_commands << "xargs git checkout #{branch}"
+      cp_commands.join("|")
+    end
+  end
+end

data/lib/fgit/version.rb

@@ -1,3 +1,3 @@
 module Fgit
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fgit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - yan_runchen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,7 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: extend git for file manipulating from branch to branch
+description: make command more easy to use for file manipulating from branch to branch
+  base on git command
 email:
 - chen_0_1987@sina.com
 executables:
@@ -72,6 +73,7 @@ files:
 - fgit.gemspec
 - lib/fgit.rb
 - lib/fgit/cli.rb
+- lib/fgit/common.rb
 - lib/fgit/version.rb
 homepage: https://github.com/SmileZero/fgit
 licenses:
@@ -96,5 +98,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: extend git for file manipulating from branch to branch
+summary: make command more easy to use for file manipulating from branch to branch
+  base on git command
 test_files: []