specific_install 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1b4150e9945dfd11ae1805180cfb553882fc4b07
-  data.tar.gz: 05184004d0b88f47e6a5048874f38c76cd6aac99
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjE1Y2JmOWUwZDk1ODRiNTAyOTYxZjFkNzVlOGYzMGQwODVjMDliYQ==
+  data.tar.gz: !binary |-
+    OTdiYjdiNGY3NjlhNTVkZDhlODIxZGViZjBhMTc4ZTFiMmJkOTAwYg==
 SHA512:
-  metadata.gz: ff5498b13499b77a2e9835568fa9a2c332f599c2c9f4c4b8e0cf4ef27192477bcb5bbd207293502eb65f04f2f65a7eb209a30a83cbad5daba0d99c3692fd3e0f
-  data.tar.gz: 15e3c433ecb0d6913cb6195278430a5bdcad080cc4cbb786ba342244deead241b459e5d9da7d535557cb4051cdbaa643b30fb792aa1d4477bc6f3acb4d4270d8
+  metadata.gz: !binary |-
+    MzUyMmU3OWUzZDIwMjc2YzlkNTAxZDUwYmYxNDAzNzc0YzU4NmEyODY2ZjZm
+    MTU4OTkzNTFmYjJhMzhmMTY2OTUzYzAwZDM0NmM0OWJlZWQ4OWMwMjRmOWEy
+    ZmE5MjgxZjY1OWU2ZmJkMTYwZmFlOTI0MDZjOWZiYzBhZjAwYTc=
+  data.tar.gz: !binary |-
+    NTNkMjA1OWMxMzE4ZjEzYjgzZjkzZTJhZjQ3N2YzMzNmOTkwNWRjNjYzYTFl
+    MTBkMTc0MDQyNjgzMzY0YmIyOGNhMzczY2ZkNjVjMDI3ZjM1Mjc3ZTE2ZDU5
+    MWNhOWYyMDA3NTM3MzM0YmRmMmNjOGVhNmQzMGI4ZmE5MDk2MDA=

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    specific_install (0.2.8)
+    specific_install (0.3.0)
       backports
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.3.4)
+    backports (3.6.0)
     diff-lcs (1.2.4)
     multi_json (1.8.0)
     os (0.9.6)
@@ -39,3 +39,6 @@ DEPENDENCIES
   simplecov
   simplecov-vim
   specific_install!
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -47,6 +47,12 @@ Or a specific branch in an explicit way
   $ gem specific_install -l http://github.com/githubsvnclone/rdoc.git -b edge
 `
 
+Or a specific subdirectory in a repo 
+
+`
+  $ gem specific_install https://github.com/orlandohill/waxeye -d src/ruby
+`
+
 The following URI types are accepted:
 
 - http(s)://github.com/rdp/specific_install.git
@@ -71,6 +77,9 @@ The following URI types are accepted:
           `git specific_install -l rdp/specific_install -b pre-release`
       Note: This feature is new and may not fail gracefully.
 
+    -d --directory DIRECTORY in source
+      This will change the directory in the downloaded source directory
+      before building the gem. 
 
     `git_install` is aliased to the behavior of `specific_install`
       This alias is shorter and is more intention revealing of the gem's behavior.

data/lib/rubygems/commands/specific_install_command.rb

@@ -24,11 +24,15 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
       options[:branch] = branch
     end
 
+    add_option('-d', '--directory DIRECTORY', arguments) do |directory, options|
+      options[:directory] = directory
+    end
   end
 
   def arguments
     "LOCATION like http://github.com/rdp/ruby_tutorials_core or git://github.com/rdp/ruby_tutorials_core.git or http://host/gem_name.gem\n" +
-    "BRANCH (optional) like beta, or new-feature"
+    "BRANCH (optional) like beta, or new-feature\n" +
+    "DIRECTORY (optional) This will change the directory in the downloaded source directory before building the gem."
   end
 
   def usage
@@ -42,7 +46,13 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
       raise ArgumentError, "No location received. Use like `gem specific_install -l http://example.com/rdp/specific_install`"
     end
     Dir.mktmpdir do |dir|
-      @dir = dir
+      if subdir = options[:directory]
+        abort("Subdir '#{subdir}' is not a valid directory") unless valid_subdir?(subdir)
+        @top_dir = dir
+        @src_dir = File.join(dir, subdir)
+      else
+        @top_dir = @src_dir = dir
+      end
       determine_source_and_install
     end
   end
@@ -73,7 +83,7 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
   end
 
   def install_gem
-    Dir.chdir @dir do
+    Dir.chdir @top_dir do
       output.puts "downloading #{@loc}"
       download(@loc, gem_name)
 
@@ -91,8 +101,8 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
     @loc = [@loc, '.git'].join unless @loc[/\.git$/]
 
     redirect_for_specs = ENV.fetch( "SPECIFIC_INSTALL_SPEC" ) { "" }
-    system("git clone #{@loc} #{@dir} #{redirect_for_specs}")
-    install_from_git(@dir)
+    system("git clone #{@loc} #{@top_dir} #{redirect_for_specs}")
+    install_from_git(@src_dir)
   end
 
   def gem_name
@@ -103,16 +113,16 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
     output.puts 'git installing from ' + @loc
 
     redirect_for_specs = ENV.fetch( "SPECIFIC_INSTALL_SPEC" ) { "" }
-    system("git clone #{@loc} #{@dir} #{redirect_for_specs}")
-    install_from_git(@dir)
+    system("git clone #{@loc} #{@top_dir} #{redirect_for_specs}")
+    install_from_git(@src_dir)
   end
 
   def install_shorthand
     output.puts "Installing from git@github.com:#{@loc}.git"
 
     redirect_for_specs = ENV.fetch( "SPECIFIC_INSTALL_SPEC" ) { "" }
-    system("git clone git@github.com:#{@loc}.git #{@dir} #{redirect_for_specs}")
-    install_from_git(@dir)
+    system("git clone git@github.com:#{@loc}.git #{@top_dir} #{redirect_for_specs}")
+    install_from_git(@src_dir)
   end
 
   def download( full_url, output_name )
@@ -124,8 +134,10 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
 
   def install_from_git(dir)
     Dir.chdir dir do
-      change_to_branch(@branch) if @branch
-      system("git submodule update --init --recursive") # issue 25
+      Dir.chdir @top_dir do
+        change_to_branch(@branch) if @branch
+        system("git submodule update --init --recursive") # issue 25
+      end
       # reliable method
       if install_gemspec
         success_message
@@ -201,6 +213,15 @@ class Gem::Commands::SpecificInstallCommand < Gem::Command
     system("git checkout #{branch}")
     system("git branch")
   end
+
+  DOTDOT_REGEX = /(?:#{File::PATH_SEPARATOR}|\A)\.\.(?:#{File::PATH_SEPARATOR}|\z)/.freeze
+  ABS_REGEX = /\A#{File::PATH_SEPARATOR}/.freeze
+
+  def valid_subdir?(subdir)
+    !subdir.empty? &&
+      subdir !~ DOTDOT_REGEX &&
+      subdir !~ ABS_REGEX
+  end
 end
 
 class Gem::Commands::GitInstallCommand < Gem::Commands::SpecificInstallCommand

data/lib/specific_install/version.rb

@@ -1,3 +1,3 @@
 module SpecificInstall
-  VERSION = "0.2.13"
+  VERSION = "0.3.0"
 end

data/spec/specific_install_spec.rb

@@ -39,7 +39,7 @@ describe Gem::Commands::SpecificInstallCommand do
           dir
         end
       end
-      subject.instance_variable_set(:@dir, "foo")
+      subject.instance_variable_set(:@top_dir, "foo")
     end
     describe "#install_git" do
       before do
@@ -218,4 +218,4 @@ describe "Integration Tests" do
       expect(stdout).to match(/Successfully installed/)
     end
   end
-end
+end if ENV['SPECIFIC_INSTALL_INTEGRATION_SPECS']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specific_install
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Roger Pack
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   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: sane
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: simplecov
   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: simplecov-vim
   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: rubygems plugin that allows you you to install a gem from from its github
@@ -118,7 +118,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - ChangeLog
 - Gemfile
 - Gemfile.lock
@@ -142,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubyforge_project: ! '[none]'
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: rubygems plugin that allows you you to install a gem from from its github
@@ -160,4 +160,3 @@ summary: rubygems plugin that allows you you to install a gem from from its gith
 test_files:
 - spec/spec_helper.rb
 - spec/specific_install_spec.rb
-has_rdoc: