binding-debug 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20e52b86aa720bfef05903771a5908cd80cee082212a8d87b739528d2b9bbc9
-  data.tar.gz: 98bd76059c0643eb7dc174e7771a20cd04120ce793816a1e5eb5bab2a4ab0a7c
+  metadata.gz: 4dc80b554de30e00e748016f0e0f46bef5acfc7157249560465850b8816fd46c
+  data.tar.gz: 4113961c5ed661c20c882c346b4ad88acf6b82e7c2b2d319bf22b5b516dc2633
 SHA512:
-  metadata.gz: 75a0a6977fd48b6532aae00d6c7e639e3d011ccd5b6084e54098fec69cd1f96a78f39ce40e2611a1b158fb4fae4ac5a648f50d935fb544897cddbfbd43a3aad1
-  data.tar.gz: 014da2b8fca57aeed0b04b4cfb820e2892334343a881e9ee12059423047899cbd8b33231073338d7cdb0462a6aa56d48490b4c10f84dab56ecd1b5da18d228f3
+  metadata.gz: 0c324146dca90da0221e1961678fee5a4266775fcdb6d69495c65f70703672a34159d825e89a57c1be708618db9191bb2c465fe674eeba4a489b9b0d265f0a4c
+  data.tar.gz: 2ff101b9ad0c26d294645c8b1cdf796e55524b42e81ae5d01001622fa1c3a53aaf0075261e4275782dce6210bad97af0aecd65084709ec467d56addc1fb45e4f

data/.github/workflows/macos.yml

@@ -0,0 +1,22 @@
+name: macos
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: |
+        bundle exec rake spec

data/.github/workflows/ubuntu-rvm.yml

@@ -0,0 +1,35 @@
+name: ubuntu-rvm
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ 'ruby-head' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up RVM
+      run: |
+        curl -sSL https://get.rvm.io | bash
+    - name: Set up Ruby
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        rvm install ${{ matrix.ruby }} --binary
+        rvm --default use ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        bundle exec rake spec

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,29 @@
+name: ubuntu
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: |
+        bundle exec rake spec

data/.github/workflows/windows.yml

@@ -0,0 +1,31 @@
+name: windows
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+    - name: Bundle install
+      run: |
+        bundle install
+    - name: Run test
+      run: |
+        bundle exec rake spec

data/.travis.yml

@@ -2,4 +2,5 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.0
+  - 2.6.0
 before_install: gem install bundler -v 1.16.1

data/README.md

@@ -28,7 +28,7 @@ require "binding/debug"
 using BindingDebug
 
 def plus a, b
-	a + b
+  a + b
 end
 
 #######################################
@@ -65,10 +65,10 @@ binding.p "plus(1, 2)"
 
 foo = "homu"
 binding.puts %{
-	foo.to_s.upcase
-	plus 1, 2
-	(0..20).to_a
-	foo.class.name
+  foo.to_s.upcase
+  plus 1, 2
+  (0..20).to_a
+  foo.class.name
 }
 # output:
 # foo.to_s.upcase : HOMU
@@ -77,6 +77,36 @@ binding.puts %{
 # foo.class.name : String
 ```
 
+### `puts` with blocks
+
+```ruby
+require "binding/debug"
+
+using BindingDebug
+
+def plus a, b
+  a + b
+end
+
+foo = "homu"
+
+# puts with blocks
+puts {
+  foo.to_s.upcase
+  plus 1, 2
+  (0..20).to_a
+  foo.class.name
+}
+# output:
+# foo.to_s.upcase : HOMU
+# plus 1, 2 : 3
+# (0..20).to_a : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+# foo.class.name : String
+```
+
+Supported `Kernel.#p` , `Kernel.#pp`.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -86,3 +116,19 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/osyo-manga/gem-binding-debug.
+
+
+## Release Note
+
+#### 0.2.0
+
+* Add `BindingDebug::Formats`
+* Add `Binding#pp`
+* Add with block in `Kernle.#puts` `Kernle.#p` `Kernle.#pp` 
+  * e.g `puts { value } # => "value : #{value}"`
+
+#### 0.1.0
+
+* Release!!
+
+

data/binding-debug.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "binding_of_caller"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/binding/debug.rb

@@ -1,21 +1,133 @@
 require "binding/debug/version"
+require "binding_of_caller"
+require "pp"
 
 module BindingDebug
-	refine Binding do
-		def debug expr, &block
-			block ||= proc { |name, value| "#{name} : #{value}" }
-			binding = self
-			expr.split("\n").reject { |it| /^\s*$/ =~ it }.map(&:strip).map { |expr|
-				block.call expr, binding.eval(expr)
-			}.join("\n")
-		end
-
-		def p expr, &block
-			super debug expr, &block
-		end
-
-		def puts expr, &block
-			super debug expr, &block
-		end
-	end
+  module Formats
+    module_function
+
+    def default
+      proc { |name, value| "#{name} : #{value}" }
+    end
+
+    def inspect formatter = default
+      proc { |name, value| formatter.call "#{name}.inspect", value.inspect }
+    end
+
+    def prefix str
+      proc { |name, value| "#{str} #{BindingDebug::Formats.default.call name, value}" }
+    end
+
+    def suffix str
+      proc { |name, value| "#{BindingDebug::Formats.default.call name, value} #{str}" }
+    end
+  end
+
+  refine Binding do
+    def debug expr, &block
+      block ||= Formats.default
+      binding = self
+      expr.split("\n").reject { |it| /^\s*$/ =~ it }.map(&:strip).map { |expr|
+        block.call(expr, binding.eval(expr))
+      }.join("\n")
+    end
+
+    def p expr, &block
+      block ||= Formats.default
+      puts(expr){ |name, value| block.call name, value.inspect }
+      expr
+    end
+
+    def pp expr, &block
+      block ||= Formats.default
+      puts(expr){ |name, value| block.call name, value.pretty_inspect }
+      expr
+    end
+
+    def puts expr, &block
+      Kernel.puts debug expr, &block
+    end
+  end
+
+  module ProcWithBody
+    refine RubyVM::InstructionSequence do
+      def to_h
+        %i(
+          magic
+          major_version
+          minor_version
+          format_type
+          misc
+          label
+          path
+          absolute_path
+          first_lineno
+          type
+          locals
+          args
+          catch_table
+          bytecode
+        ).zip(to_a).to_h
+      end
+    end
+    using self
+
+    refine Proc do
+      def body
+        path, (start_lnum, start_col, end_lnum, end_col) = code_location
+
+        raise "Unsupported file" if path.nil? || path == "(irb)"
+
+        File.readlines(path).yield_self { |lines|
+          start_line, end_line = lines[start_lnum-1], lines[end_lnum-1]
+
+          # MEMO: Add support `-> { hoge }`
+          start_col += start_line[(start_col+1)..-1].yield_self { |line|
+              line =~ /^>\s*{/ ? line.index("{") + 1      # Support 2.5
+            : line =~ /^\s*{/  ? line.index("{") + 1      # Support 2.6 or later
+            : 0
+          }
+
+          if start_lnum == end_lnum
+            start_line[(start_col)...(end_col)]
+          elsif end_lnum - start_lnum == 1
+            start_line[(start_col)..-1] + end_line[0...(end_col)]
+          else
+            start_line[(start_col)..-1] +
+            lines[(start_lnum)...(end_lnum-1)].join +
+            end_line[0...(end_col)]
+          end.tap { |src|
+            break $1 if src =~ /(?:^do(.+)end$)/m
+            break $1 if src =~ /(?:^\s*{(.+)}$)/m
+            break ""
+          }
+        }
+      end
+
+      def code_location
+        RubyVM::InstructionSequence.of(self).to_h
+          .yield_self { |iseq| [iseq[:absolute_path], iseq.dig(:misc, :code_range) || iseq.dig(:misc, :code_location)] }
+      end
+    end
+  end
+
+  refine Kernel do
+    using ProcWithBody
+    using BindingDebug
+
+    def puts(*args, &block)
+      return super(*args) if block.nil?
+      binding.of_caller(1).puts block.body
+    end
+
+    def p(*args, &block)
+      return super(*args) if block.nil?
+      binding.of_caller(1).p block.body
+    end
+
+    def pp(*args, &block)
+      return super(*args) if block.nil?
+      binding.of_caller(1).pp block.body
+    end
+  end
 end

data/lib/binding/debug/version.rb

@@ -1,3 +1,3 @@
 module BindingDebug
-	VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: binding-debug
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - manga_osyo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu-rvm.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -88,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 'Debug output. `name : value`'