clone_git_file 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a43dd0a36bfccd6e5c32722a835ecc6ceeac55
-  data.tar.gz: d1fd69615798975cc626c7a135e25d802d75a437
+  metadata.gz: 13bae9e061bbabf4bfaca08c32fdc35076cda098
+  data.tar.gz: 0b6bddb75912059517b079d27a50e93df2c3e5ec
 SHA512:
-  metadata.gz: 0ab9272637734ae7ae03b0ab59bf19914308af732378ab0f30f6f47ba2b959840121627af3da9d53b050b60d5fd6d6a94eb14f5558957e04013351bea58f2872
-  data.tar.gz: 93cbe3fa002925024e92131bdafbf18feae483e1587fbcedf15d72bbb2b64b0b04dacca4141d0dd393564a413db941b70036c548492b35c2d42ea5d342116fd3
+  metadata.gz: 8f79061cbdb9b1da10d2027a43ad85a54a0ef25021b58fcf255215c040174403576cab6d6a755c4af66d4c5f43bbb7f6ea706797f7c4187a81f6e072ca81fc37
+  data.tar.gz: 1967c924a6a7a68e4c667f32153462c4bcc9d8d668c8bc1222239d36262150aa221c333e6e37a28a8bbc0a121c96a878327495e01ce62dc6d33a6abf6cc98d98

data/README.md

@@ -60,18 +60,29 @@ EDITOR=mvim TARGET_DIRECTORY=~/dev clone_git_file https://github.com/brandoncc/c
 ### Bonus
 
 * You can also supply the repo url or a repo subdirectory url, and that directory will be opened by your editor.
-* Setup an alias to make using the gem easy. For example, here are mine (zsh):
+* Setup an alias and/or function to make using the gem easy. For example, here are mine (zsh):
 
     ```bash
     alias cgf="TARGET_DIRECTORY=~/dev EDITOR=mvim clone_git_file $1"
-    alias ogf="TARGET_DIRECTORY=~/dev EDITOR=mvim clone_git_file -ts $1"
+
+    function ogf () {
+      echo "Cloning, your editor will open when clone has completed..."
+      source <(TARGET_DIRECTORY=~/dev EDITOR=mvim clone_git_file -ts $1)
+    }
     ```
     
-    `cgf` clones, then prints a message with the location of the cloned file/directory.
+    `cgf` clones, then prints a message with the location of the cloned
+    file/directory.
     
-    `ogf` prints the commands to open the file/directory in my editor. I then use `source <(...)` to pipe the printed command to `source` which runs it in my current shell. This fixes some weird things that happen when opening the editor in a child process, and also allows the current directory of my current shell to be changed (instead of the child process shell which will be lost when you close the editor).
+    `ogf` prints the commands to open the file/directory in my editor. I then
+    use `source <(...)` to pipe the printed command to `source` which runs it
+    in my current shell. This fixes some weird things that happen when opening
+    the editor in a child process, and also allows the current directory of my
+    current shell to be changed (instead of the child process shell which will
+    be lost when you close the editor).
     
-    Unfortunately `$1` doesn't get passed into the nested command, so the `source <()` usage can't be in the alias (still looking for a solution to this if anybody has one), so I used TextExpander to setup a snippet which handles that part, with the final command I run being `source <(ogf https://github.com/brandoncc/clone_git_file/blob/master/README.md)`.
+    `ogf` has to be a function so that `$1` will expand properly. If you use an
+    alias instead, `$1` doesn't hold the correct value in the nested command.
 
 # Limitations
 

data/Rakefile

@@ -1,10 +1,7 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+RSpec::Core::RakeTask.new
 
-task :default => :test
+task :default => :spec
+task :test => :spec

data/clone_git_file.gemspec

@@ -21,14 +21,13 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = ["clone_git_file"]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-spec-context"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec", "~> 3.4.0"
 end

data/lib/clone_git_file.rb

@@ -4,7 +4,7 @@ require "clone_git_file/github_repo_parser"
 module CloneGitFile
   class Cloner
     def initialize(file, options = {})
-      @file = file
+      @file = file.gsub("%20", " ")
       @options = options
     end
 
@@ -35,11 +35,16 @@ module CloneGitFile
 
     def launch_editor
       commands = ""
-      file_path = "#{local_repo_path}/#{parsed_data.file_relative_path}"
+      file_path = "#{local_repo_path}"
+      file_path << "/#{parsed_data.file_relative_path}" if parsed_data.file_relative_path
 
       # change into the directory so that relative file loads will work
-      commands << "cd #{File.dirname(file_path)}"
-      commands << "\n#{ENV["EDITOR"]} #{file_path}"
+      if File.directory?(file_path)
+        commands << "cd #{file_path}"
+      else
+        commands << "cd #{File.dirname(file_path)}"
+      end
+      commands << %(\n#{ENV["EDITOR"]} "#{file_path}")
 
       if @options[:output_run_command_to_terminal]
         puts(commands)
@@ -49,14 +54,18 @@ module CloneGitFile
     end
 
     def print_clone_location
-      puts "Cloned to: #{local_repo_path}/#{parsed_data.file_relative_path}"
+      clone_path = "#{local_repo_path}"
+      clone_path << "/#{parsed_data.file_relative_path}" if parsed_data.file_relative_path
+
+      puts "Cloned to: #{clone_path}"
     end
 
     def clone_repo
       commands = ""
       commands << "git clone #{parsed_data.repo_url} #{local_repo_path}"
 
-      if parsed_data.branch_name
+      branch_name = parsed_data.branch_name
+      if branch_name && branch_name != ""
         commands << "\ncd #{local_repo_path}"
         commands << "\ngit checkout #{parsed_data.branch_name}"
       end

data/lib/clone_git_file/github_repo_parser.rb

@@ -36,10 +36,11 @@ module CloneGitFile
     end
 
     def parse_file_relative_path
-      path = @file.match(%r{#{Regexp.escape(parse_repo_url)}/(.+)$})[1]
+      path = @file.match(%r{#{Regexp.escape(parse_repo_url)}/(.+)$})
+      path = path.nil? ? "" : path[1]
       path.sub!(%r{^(?:blob|tree)/[^/]+}, '') if has_branch?
       path.sub!(%r{^/}, '')
-      path
+      path == "" ? nil : path
     rescue NoMethodError
       ''
     end

data/lib/clone_git_file/version.rb

@@ -1,3 +1,3 @@
 module CloneGitFile
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clone_git_file
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brandon Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-spec-context
+  name: rspec
   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'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 description: 
 email:
 - brandoncc@gmail.com