pry-doc 0.13.0pre6 → 0.13.0pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da533113bdf07d3a2af347f5b0508cf040a3fc04
-  data.tar.gz: 2085ee889a92d12f00314616cee4eb1e478d6061
+  metadata.gz: ecf2ae29bffe6f81c0a6ec6dce2e15c2ce364d09
+  data.tar.gz: 20fd2f5ae0a4f1cb9eab9c736e199991d40834ff
 SHA512:
-  metadata.gz: e959dacfbaf0352f943196751b847ff7942b437d5adb978eee41738ed0faeff13f0a4ce58a7859598f4dac89504187ef5c8cd3508383e84650487ce49bef8f6a
-  data.tar.gz: 50ded7372f436cdea3ea19d740ebc3ea212c1c997455626870431171c16327bbefbc35f1ca2bd507a9d861e8bb731d6e66a9c31115fe34808bfb8fc24c035f87
+  metadata.gz: de7b2c32043e9917fce673b8bf10b2070ce17e091cd08bc9708ec4d51441f22e9a6ba5c16af886cab9684f8aa29a34c62d817d6dc65c54c8eb912833e15ff122
+  data.tar.gz: 0273e48b4b2c3bfcdc0480204b065c85e3465827c13049c065edcd890a265b90005c6866c2adaa189d1e22a598fe1615aae073af1aae7b89e215d0e6486f97f0

data/Rakefile

@@ -12,6 +12,11 @@ require 'latest_ruby'
 require 'rake/clean'
 require "#{direc}/lib/#{PROJECT_NAME}/version"
 
+desc "start pry with fixture c file"
+task :pry_fixture do
+  sh %{pry -I./lib -r pry-doc -e "Pry::CInternals::CodeFetcher.ruby_source_folder = './spec/fixtures/c_source'"}
+end
+
 desc "generate fixture etags"
 task :etags do
   sh 'etags --no-members spec/fixtures/c_source/*.c -o spec/fixtures/c_source/tags'

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

@@ -12,7 +12,7 @@ module Pry::CInternals
     def extract(info)
       if info.original_symbol.start_with?("#define")
         extract_macro(info)
-      elsif info.original_symbol =~ /\s*(struct|enum)\s*/
+      elsif info.original_symbol =~ /\s+(struct|enum)\s+/
         extract_struct(info)
       elsif info.original_symbol.start_with?("}")
         extract_typedef_struct(info)
@@ -38,7 +38,7 @@ module Pry::CInternals
     end
 
     def extract_typedef_struct(info)
-      extract_code(info) do |code, direction: :reverse|
+      extract_code(info, direction: :reverse) do |code|
         return code if balanced?(code)
       end
     end

data/lib/pry-doc/version.rb

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

data/spec/fixtures/c_source/hello.c

@@ -18,3 +18,14 @@ struct baz {
   int x;
   int y;
 };
+
+typedef enum cute_enum_e {
+  lillybing,
+  tote,
+  lilt
+} baby_enum;
+
+typedef struct {
+  int lovely;
+  char horse;
+} cutie_pie;

data/spec/fixtures/c_source/tags

@@ -2,7 +2,7 @@
 goodbye.c,9
 foo(2,5
 
-hello.c,134
+hello.c,256
 foo(2,4
 #define baby 5,19
 typedef int wassup;9,73
@@ -11,3 +11,9 @@ enum bar 11,94
   beta,13,114
   gamma14,122
 struct baz 17,134
+typedef enum cute_enum_e 22,169
+  lillybing,23,196
+  tote,24,209
+  lilt25,217
+} baby_enum;26,224
+} cutie_pie;31,283

data/spec/pry-doc_spec.rb

@@ -17,10 +17,22 @@ RSpec.describe PryDoc do
       Pry::Helpers::Text.strip_color(str)
     end
 
-    before(:all) do
+    before do
       described_class.ruby_source_folder = File.join(File.dirname(__FILE__), "fixtures/c_source")
     end
 
+    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)
+
+        # 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
+        # ever gets created)
+        described_class.tagfile rescue nil
+      end
+    end
+
     describe ".symbol_map" do
       it "generates the map with the correct symbols" do
         expect(described_class.symbol_map).to have_key("foo")
@@ -28,34 +40,9 @@ RSpec.describe PryDoc do
         expect(described_class.symbol_map).to have_key("wassup")
         expect(described_class.symbol_map).to have_key("bar")
         expect(described_class.symbol_map).to have_key("baz")
-      end
-    end
-
-    context "with line numbers" do
-      context "normal style (actual line numbers)" do
-        it "displays actual line numbers" do
-          code, = described_class.new(line_number_style: :'line-numbers').fetch_first_definition("bar")
-          expect(decolor code).to include <<EOF
-11: enum bar {
-12:   alpha,
-13:   beta,
-14:   gamma
-15: };
-EOF
-        end
-
-        context "base one style (line numbers start with 1)" do
-          it "displays actual line numbers" do
-            code, = described_class.new(line_number_style: :'base-one').fetch_first_definition("bar")
-            expect(decolor code).to include <<EOF
-1: enum bar {
-2:   alpha,
-3:   beta,
-4:   gamma
-5: };
-EOF
-          end
-        end
+        expect(described_class.symbol_map).to have_key("cute_enum_e")
+        expect(described_class.symbol_map).to have_key("baby_enum")
+        expect(described_class.symbol_map).to have_key("cutie_pie")
       end
     end
 
@@ -78,6 +65,34 @@ EOF
     end
 
     describe "#fetch_first_definition" do
+      context "with line numbers" do
+        context "normal style (actual line numbers)" do
+          it "displays actual line numbers" do
+            code, = described_class.new(line_number_style: :'line-numbers').fetch_first_definition("bar")
+            expect(decolor code).to include <<EOF
+11: enum bar {
+12:   alpha,
+13:   beta,
+14:   gamma
+15: };
+EOF
+          end
+
+          context "base one style (line numbers start with 1)" do
+            it "displays actual line numbers" do
+              code, = described_class.new(line_number_style: :'base-one').fetch_first_definition("bar")
+              expect(decolor code).to include <<EOF
+1: enum bar {
+2:   alpha,
+3:   beta,
+4:   gamma
+5: };
+EOF
+            end
+          end
+        end
+      end
+
       it "returns the code for a function" do
         code, = described_class.new(line_number_style: nil).fetch_first_definition("foo")
         expect(decolor code).to include(<<EOF
@@ -125,6 +140,28 @@ struct baz {
 };
 EOF
       end
+
+      it "returns the code for a typedef'd struct" do
+        code, = described_class.new(line_number_style: nil).fetch_first_definition("cutie_pie")
+        expect(decolor code).to include <<EOF
+typedef struct {
+  int lovely;
+  char horse;
+} cutie_pie;
+EOF
+      end
+
+      it "returns the code for a typedef'd enum" do
+        code, = described_class.new(line_number_style: nil).fetch_first_definition("baby_enum")
+        expect(decolor code).to include <<EOF
+typedef enum cute_enum_e {
+  lillybing,
+  tote,
+  lilt
+} baby_enum;
+EOF
+      end
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-doc
 version: !ruby/object:Gem::Version
-  version: 0.13.0pre6
+  version: 0.13.0pre7
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard