pry-doc 0.13.2pre6 → 0.13.2pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad15e20d11d68e36a2bf2fa5187d1b7551b94c75ac3d1201a2dcd14883247322
-  data.tar.gz: 8c650e9e6250e86806f33e0d4af8214ea9ff8b3fa461d50c708440f6b2723a3b
+  metadata.gz: 1a92e58a3ca468b0210dcebc21c7a7a466ab8167c0fff8b6ef78f634c0d938db
+  data.tar.gz: 416ea1f86b706da35c66bcb2e4e4b20969d0533abca761ecc9d71e6829124a46
 SHA512:
-  metadata.gz: a3c06161e8a146295adad2bcf8c666e81d063450abc2ded4d07db73eb801d454f4044bf47dcdf58c6f5c772174ce3a57d847acdf77754f40fc3c6df3b9e85478
-  data.tar.gz: f2dc5aaf3918fe5f4f4bbb3fc1c7bd35b921e0ab7bae05e8f2443416cee8034081bdb70437148127d62455415a26fda1ed58207249b7498495e3b0e7b7f2c531
+  metadata.gz: 68ccf8ee9fd41abda6ed98013335f71cc4bb2e7dad1909fc5c31301e462e2fef2d62b5e8589cf5efa287f05b21e02038bdc186218f738a16f78781fe287d3028
+  data.tar.gz: a958ebf650666981c40ab95626c6316ef70290193c2d07bd482abafa903b87df0452a246f7561b2fbf43d5d90e40dfae6970fc89d570a171a7507accb304dc2c

data/lib/pry-doc.rb

@@ -1,8 +1,3 @@
-require 'yard'
-
-require 'pry-doc/version'
-require 'pry-doc/pry_ext/method_info'
-
 module PryDoc
   def self.load_yardoc(version)
     path = "#{File.dirname(__FILE__)}/pry-doc/docs/#{version}"
@@ -23,4 +18,8 @@ module PryDoc
   root
 end
 
+require 'yard'
+require 'pry-doc/version'
+require 'pry-doc/pry_ext/method_info'
+
 PryDoc.load_yardoc(RUBY_VERSION[0...3].sub!('.', ''))

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

@@ -41,7 +41,7 @@ module Pry::CInternals
     end
 
     def full_path_for(file_name)
-      if RbConfig::CONFIG['host'] =~ /mswin|mingw/
+      if Pry::Platform.windows?
         # windows etags already has the path expanded, wtf
         file_name
       else

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

@@ -9,6 +9,7 @@ module Pry::CInternals
 
     class << self
       attr_accessor :ruby_source_folder
+      attr_accessor :ruby_source_installer
     end
 
     # The Ruby version that corresponds to a downloadable release
@@ -22,6 +23,7 @@ module Pry::CInternals
     end
 
     self.ruby_source_folder = File.join(File.expand_path("~/.pry.d"), "ruby-#{ruby_version}")
+    self.ruby_source_installer = RubySourceInstaller.new(ruby_version, ruby_source_folder)
 
     attr_reader :line_number_style
     attr_reader :symbol_extractor
@@ -72,10 +74,11 @@ module Pry::CInternals
     end
 
     def self.symbol_map
-      parse_tagfile
-      @symbol_map ||= @c_files.each_with_object({}) do |v, h|
-        h.merge!(v.symbols) { |k, old_val, new_val| old_val + new_val }
-      end
+      @symbol_map ||= (
+        parse_tagfile
+        @c_files.each_with_object({}) do |v, h|
+          h.merge!(v.symbols) { |k, old_val, new_val| old_val + new_val }
+        end)
     end
 
     def self.parse_tagfile
@@ -87,15 +90,9 @@ module Pry::CInternals
     def self.tagfile
       tags = File.join(ruby_source_folder, "TAGS")
       if !File.exists?(tags)
-        RubySourceInstaller.new(ruby_version, ruby_source_folder).install
+        ruby_source_installer.install
       end
       @tagfile ||= File.read(tags)
     end
-
-    # @param [String] message Message to display on error
-    # @param [&Block] block Optional assertion
-    def self.check_for_error(message, &block)
-      raise Pry::CommandError, message if $?.to_i != 0 || block && !block.call
-    end
   end
 end

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

@@ -3,9 +3,15 @@ module Pry::CInternals
     attr_reader :ruby_version
     attr_reader :ruby_source_folder
 
+    attr_accessor :curl_cmd
+    attr_accessor :etag_binary
+    attr_accessor :etag_cmd
+
     def initialize(ruby_version, ruby_source_folder)
       @ruby_version = ruby_version
       @ruby_source_folder = ruby_source_folder
+
+      set_platform_specific_commands
     end
 
     def install
@@ -16,8 +22,24 @@ module Pry::CInternals
       puts "...Finished!"
     end
 
+    private
+
+    def set_platform_specific_commands
+      if Pry::Platform.windows?
+        self.curl_cmd = "curl -k --fail -L -O https://github.com/ruby/ruby/archive/v#{ruby_version}.zip " +
+                        "& 7z -y x v#{ruby_version}.zip"
+        self.etag_binary = File.join(PryDoc.root, "libexec/windows/etags")
+        self.etag_cmd = %{dir /b /s *.c *.h *.y | "#{etag_binary}" - --no-members}
+      else
+        self.curl_cmd = "curl --fail -L https://github.com/ruby/ruby/archive/v#{ruby_version}.tar.gz | tar xzvf - 2> /dev/null"
+        self.etag_binary = Pry::Platform.linux? ? File.join(PryDoc.root, "libexec/linux/etags-#{arch}") : "etags"
+        self.etag_cmd = "find . -type f -name '*.[chy]' | #{etag_binary} - --no-members"
+      end
+    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 "
+      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"
@@ -39,33 +61,8 @@ module Pry::CInternals
       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
+    def arch
+      RbConfig::CONFIG['arch'] =~ /i(3|6)86/ ? 32 : 64
     end
 
     def generate_tagfile

data/lib/pry-doc/version.rb

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

data/spec/pry-doc_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe PryDoc do
     context "no tags file exists" do
       it "attempts to install and setup ruby" do
         described_class.ruby_source_folder = File.join(File.dirname(__FILE__), "fishface")
-        expect(described_class).to receive(:install_and_setup_ruby_source)
+        expect(described_class.ruby_source_installer).to receive(:install)
 
         # will try to read from the 'created' tags file, this will error, so rescue
         # (since we're stubbing out `install_and_setup_ruby_source` no tags file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-doc
 version: !ruby/object:Gem::Version
-  version: 0.13.2pre6
+  version: 0.13.2pre7
 platform: ruby
 authors:
 - John Mair (banisterfiend)