pry-doc 0.13.2pre5 → 0.13.2pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e03a24e1b0b08449718fdd990b4aee51dcb95784c07223078105ed5510de5c8
-  data.tar.gz: 67a81b1d1447663bd4f722b64f8698dde4dfd9d583d8ea02557a709ece691f1d
+  metadata.gz: ad15e20d11d68e36a2bf2fa5187d1b7551b94c75ac3d1201a2dcd14883247322
+  data.tar.gz: 8c650e9e6250e86806f33e0d4af8214ea9ff8b3fa461d50c708440f6b2723a3b
 SHA512:
-  metadata.gz: 19d64ec89537c727aff83347773983e4a8503db5478899a4c42865b017977729d1994e6930234fa61ac4525a1cd81e64392e750ddd09a5c60bd3d1993d04fd69
-  data.tar.gz: 2d30085ec8d034f7be0beb65c0ad1828ecbc702351b58411e3e408a7bf3b111f7751a830d3887dab156192d204a3b719b524d92fd6adfb02db83d8f9a315b4c8
+  metadata.gz: a3c06161e8a146295adad2bcf8c666e81d063450abc2ded4d07db73eb801d454f4044bf47dcdf58c6f5c772174ce3a57d847acdf77754f40fc3c6df3b9e85478
+  data.tar.gz: f2dc5aaf3918fe5f4f4bbb3fc1c7bd35b921e0ab7bae05e8f2443416cee8034081bdb70437148127d62455415a26fda1ed58207249b7498495e3b0e7b7f2c531

data/lib/pry-doc/pry_ext/show_source_with_c_internals/code_fetcher.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require_relative 'c_file'
 require_relative 'symbol_extractor'
+require_relative 'ruby_source_installer'
 
 module Pry::CInternals
   class CodeFetcher
@@ -85,8 +86,9 @@ module Pry::CInternals
 
     def self.tagfile
       tags = File.join(ruby_source_folder, "TAGS")
-      install_and_setup_ruby_source unless File.exists?(tags)
-
+      if !File.exists?(tags)
+        RubySourceInstaller.new(ruby_version, ruby_source_folder).install
+      end
       @tagfile ||= File.read(tags)
     end
 
@@ -95,73 +97,5 @@ module Pry::CInternals
     def self.check_for_error(message, &block)
       raise Pry::CommandError, message if $?.to_i != 0 || block && !block.call
     end
-
-    def self.ask_for_install
-      print "Identifier not found - do you want to install CRuby sources to attempt to resolve the identifier there?\nThis allows the lookup of C internals Y/N "
-
-      if $stdin.gets !~ /^y/i
-        puts "CRuby sources not installed. To prevent being asked again, add `Pry.config.skip_cruby_source = true` to your ~/.pryrc"
-        raise Pry::CommandError, "No definition found."
-      end
-    end
-
-    def self.install_and_setup_ruby_source
-      ask_for_install
-      puts "Downloading and setting up Ruby #{ruby_version} source..."
-      download_ruby
-      generate_tagfile
-      puts "...Finished!"
-    end
-
-    # for windows support need to:
-    # (1) curl -k --fail -L https://github.com/ruby/ruby/archive/v2_4_1.zip
-    # need -k as insecure as don't have root certs
-    # (2) 7z x v2_4_1.zip to extract it (via 7zip, choco install 7zip)
-    # (3) generate etags with: dir /b /s *.c *.h *.y | etags - --no-members
-    # (4) Done!
-    def self.download_ruby
-      FileUtils.mkdir_p(ruby_source_folder)
-      FileUtils.cd(File.dirname(ruby_source_folder)) do
-        %x{ #{curl_cmd} }
-        check_for_error(curl_cmd) { Dir.entries(ruby_source_folder).count > 5 }
-      end
-    end
-
-    def self.curl_cmd
-      if Pry::Platform.windows?
-        %{
-          curl -k --fail -L -O https://github.com/ruby/ruby/archive/v#{ruby_version}.zip & 7z -y x v#{ruby_version}.zip
-        }
-      else
-        "curl --fail -L https://github.com/ruby/ruby/archive/v#{ruby_version}.tar.gz | tar xzvf - 2> /dev/null"
-      end
-    end
-
-    def self.etag_binary
-      @etag_binary ||= if Pry::Platform.linux?
-                         arch = RbConfig::CONFIG['arch'] =~ /i(3|6)86/ ? 32 : 64
-                         File.join(PryDoc.root, "libexec/linux/etags-#{arch}")
-                       elsif Pry::Platform.windows?
-                         File.join(PryDoc.root, "libexec/windows/etags")
-                       else
-                         "etags"
-                       end
-    end
-
-    def self.etag_cmd
-      if Pry::Platform.windows?
-        %{dir /b /s *.c *.h *.y | "#{etag_binary}" - --no-members}
-      else
-        "find . -type f -name '*.[chy]' | #{etag_binary} - --no-members"
-      end
-    end
-
-    def self.generate_tagfile
-      FileUtils.cd(ruby_source_folder) do
-        puts "Generating tagfile!"
-        %x{ #{etag_cmd} }
-        check_for_error(etag_cmd) { File.size(File.join(ruby_source_folder, "TAGS")) > 500 }
-      end
-    end
   end
 end

data/lib/pry-doc/pry_ext/show_source_with_c_internals/ruby_source_installer.rb

@@ -0,0 +1,79 @@
+module Pry::CInternals
+  class RubySourceInstaller
+    attr_reader :ruby_version
+    attr_reader :ruby_source_folder
+
+    def initialize(ruby_version, ruby_source_folder)
+      @ruby_version = ruby_version
+      @ruby_source_folder = ruby_source_folder
+    end
+
+    def install
+      ask_for_install
+      puts "Downloading and setting up Ruby #{ruby_version} source..."
+      download_ruby
+      generate_tagfile
+      puts "...Finished!"
+    end
+
+    def ask_for_install
+      print "Identifier not found - do you want to install CRuby sources to attempt to resolve the identifier there?\nThis allows the lookup of C internals Y/N "
+
+      if $stdin.gets !~ /^y/i
+        puts "CRuby sources not installed. To prevent being asked again, add `Pry.config.skip_cruby_source = true` to your ~/.pryrc"
+        raise Pry::CommandError, "No definition found."
+      end
+    end
+
+    def download_ruby
+      FileUtils.mkdir_p(ruby_source_folder)
+      FileUtils.cd(File.dirname(ruby_source_folder)) do
+        %x{ #{curl_cmd} }
+        check_for_error(curl_cmd) { Dir.entries(ruby_source_folder).count > 5 }
+      end
+    end
+
+    # @param [String] message Message to display on error
+    # @param [&Block] block Optional assertion
+    def check_for_error(message, &block)
+      raise Pry::CommandError, message if $?.to_i != 0 || block && !block.call
+    end
+
+    def curl_cmd
+      if Pry::Platform.windows?
+        %{
+          curl -k --fail -L -O https://github.com/ruby/ruby/archive/v#{ruby_version}.zip & 7z -y x v#{ruby_version}.zip
+        }
+      else
+        "curl --fail -L https://github.com/ruby/ruby/archive/v#{ruby_version}.tar.gz | tar xzvf - 2> /dev/null"
+      end
+    end
+
+    def etag_binary
+      @etag_binary ||= if Pry::Platform.linux?
+                         arch = RbConfig::CONFIG['arch'] =~ /i(3|6)86/ ? 32 : 64
+                         File.join(PryDoc.root, "libexec/linux/etags-#{arch}")
+                       elsif Pry::Platform.windows?
+                         File.join(PryDoc.root, "libexec/windows/etags")
+                       else
+                         "etags"
+                       end
+    end
+
+    def etag_cmd
+      if Pry::Platform.windows?
+        %{dir /b /s *.c *.h *.y | "#{etag_binary}" - --no-members}
+      else
+        "find . -type f -name '*.[chy]' | #{etag_binary} - --no-members"
+      end
+    end
+
+    def generate_tagfile
+      FileUtils.cd(ruby_source_folder) do
+        puts "Generating tagfile!"
+        %x{ #{etag_cmd} }
+        check_for_error(etag_cmd) { File.size(File.join(ruby_source_folder, "TAGS")) > 500 }
+      end
+    end
+  end
+end

data/lib/pry-doc/version.rb

@@ -1,3 +1,3 @@
 module PryDoc
-  VERSION = '0.13.2pre5'
+  VERSION = '0.13.2pre6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-doc
 version: !ruby/object:Gem::Version
-  version: 0.13.2pre5
+  version: 0.13.2pre6
 platform: ruby
 authors:
 - John Mair (banisterfiend)
@@ -131,6 +131,7 @@ files:
 - lib/pry-doc/pry_ext/show_source_with_c_internals.rb
 - lib/pry-doc/pry_ext/show_source_with_c_internals/c_file.rb
 - lib/pry-doc/pry_ext/show_source_with_c_internals/code_fetcher.rb
+- lib/pry-doc/pry_ext/show_source_with_c_internals/ruby_source_installer.rb
 - lib/pry-doc/pry_ext/show_source_with_c_internals/symbol_extractor.rb
 - lib/pry-doc/version.rb
 - libexec/linux/etags-32