callsite 0.0.3 → 0.0.4

data/README.rdoc

@@ -18,6 +18,21 @@ Gives back
 
 This is also suitable for parsing a backtrace, to get detailed information about it.
 
+  begin
+    raise
+  rescue
+    pp Callsite.parse($!)
+  end
+
+Produces
+
+  => [#<struct Callsite::Line filename="(irb)", line=27, method="irb_binding">,
+   #<struct Callsite::Line
+    filename="/opt/local/lib/ruby/1.8/irb/workspace.rb",
+    line=52,
+    method="irb_binding">,
+   #<struct Callsite::Line filename="", line=0, method=nil>]
+
 There are also six methods which patch existing objects to give you powerful usage of the caller.
 
 === Callsite.activate_string_methods

data/Rakefile

@@ -1,6 +1,6 @@
 require 'spec'
 require 'spec/rake/spectask'
-task :spec => ['spec:dirge', 'spec:load_path_find']
+task :spec => ['spec:dirge', 'spec:load_path_find', 'spec:callsite']
 namespace(:spec) do
   Spec::Rake::SpecTask.new(:dirge) do |t|
     t.spec_opts ||= []
@@ -18,5 +18,15 @@ namespace(:spec) do
     t.spec_files = FileList['spec/**/load_path_find_spec.rb']
   end
 
+  Spec::Rake::SpecTask.new(:callsite) do |t|
+    t.spec_opts ||= []
+    t.spec_opts << "-rubygems"
+    t.spec_opts << '-rlib/load_path_find'
+    t.spec_opts << "--options" << "spec/spec.opts"
+    t.spec_files = FileList['spec/**/callsite_spec.rb']
+  end
+
 end
 
+require 'ext/gem_rake'
+Bundler::GemHelper.install_tasks

data/callsite.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hull"]
-  s.date = %q{2010-07-15}
+  s.date = %q{2010-07-22}
   s.description = %q{Caller/backtrace parser with some useful utilities for manipulating the load path, and doing other relative things.}
   s.email = %q{joshbuddy@gmail.com}
   s.extra_rdoc_files = [

data/ext/gem_rake.rb

@@ -0,0 +1,126 @@
+module Bundler
+  class GemHelper
+
+    def self.install_tasks
+      dir = caller.find{|c| /Rakefile:/}[/^(.*?)\/Rakefile:/, 1]
+      GemHelper.new(dir).install
+    end
+
+    attr_reader :spec_path, :base, :name
+
+    def initialize(base, name = nil)
+      @base = base
+      @name = name || interpolate_name
+      @spec_path = File.join(@base, "#{@name}.gemspec")
+    end
+
+    def install
+      desc 'Build your gem into the pkg directory'
+      task 'build' do
+        build_gem
+      end
+
+      desc 'Install your gem into the pkg directory'
+      task 'install' do
+        install_gem
+      end
+
+      desc 'Push your gem to rubygems'
+      task 'push' do
+        push_gem
+      end
+    end
+
+    def build_gem
+      file_name = nil
+      sh("gem build #{spec_path}") {
+        file_name = File.basename(built_gem_path)
+        FileUtils.mkdir_p(File.join(base, 'pkg'))
+        FileUtils.mv(built_gem_path, 'pkg')
+      }
+      File.join(base, 'pkg', file_name)
+    end
+
+    def install_gem
+      built_gem_path = build_gem
+      sh("gem install #{built_gem_path}")
+    end
+
+    def push_gem
+      guard_clean
+      guard_already_tagged
+      tag_version {
+        git_push
+        rubygem_push(build_gem)
+      }
+    end
+
+    protected
+    def rubygem_push(path)
+      sh("gem push #{path}")
+    end
+
+    def built_gem_path
+      Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
+    end
+
+    def interpolate_name
+      gemspecs = Dir[File.join(base, "*.gemspec")]
+      raise "Unable to determine name from existing gemspec." unless gemspecs.size == 1
+
+      File.basename(gemspecs.first)[/^(.*)\.gemspec$/, 1]
+    end
+
+    def git_push
+      sh "git push --all"
+      sh "git push --tags"
+    end
+
+    def guard_already_tagged
+      sh('git tag').split(/\n/).include?(current_version_tag) and raise("This tag has already been committed to the repo.")
+    end
+
+    def guard_clean
+      clean? or raise("There are files that need to be committed first.")
+    end
+
+    def clean?
+      sh("git ls-files -dm").split("\n").size.zero?
+    end
+
+    def tag_version
+      sh "git tag #{current_version_tag}"
+      yield if block_given?
+    rescue
+      sh "git tag -d #{current_version_tag}"
+      raise
+    end
+
+    def current_version
+      raise("Version file could not be found at #{version_file_path}") unless File.exist?(version_file_path)
+      File.read(version_file_path)[/V(ERSION|ersion)\s*=\s*(["'])(.*?)\2/, 3]
+    end
+
+    def version_file_path
+      File.join(base, 'lib', name, 'version.rb')
+    end
+
+    def current_version_tag
+      "v#{current_version}"
+    end
+
+    def sh(cmd, &block)
+      output, code = sh_with_code(cmd, &block)
+      code == 0 ? output : raise(output)
+    end
+
+    def sh_with_code(cmd, &block)
+      output = ''
+      Dir.chdir(base) { 
+        output = `#{cmd}`
+        block.call if block and $? == 0
+      }
+      [output, $?]
+    end
+  end
+end

data/lib/callsite.rb

@@ -14,7 +14,9 @@ module Callsite
   end
 
   def self.parse(input)
-    if input.is_a?(Array)
+    if input.respond_to?(:backtrace)
+      parse(input.backtrace)
+    elsif input.is_a?(Array)
       block_given? ?
         input.each{|line| yield parse(line)} :
         input.map{|line| parse(line)}

data/lib/callsite/version.rb

@@ -1,3 +1,3 @@
 module Callsite
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/lib/loaders/kernel_require.rb

@@ -4,7 +4,7 @@ module Kernel
   end
 
   def require_next(req)
-    found, current = false, File.expand_path(caller.first[/^[^:]+/])
+    found, current = false, File.expand_path(caller.first[/(.*)(:\d+)/,1])
     $LOAD_PATH.find_all_files(req, ".rb") do |file|
       if found
         $LOADED_FEATURES << req

data/spec/callsite_spec.rb

@@ -0,0 +1,16 @@
+describe 'Callsite' do
+
+  it "should parse dir:name/file:name:12" do
+    @parsed = Callsite.parse('dir:name/file:name:12')
+    @parsed.filename.should == 'dir:name/file:name'
+    @parsed.line.should == 12
+    @parsed.method.should == nil
+  end
+
+  it "should parse dir:name/file:name:12:in `something'" do
+    @parsed = Callsite.parse("dir:name/file:name:12:in `something'")
+    @parsed.filename.should == 'dir:name/file:name'
+    @parsed.line.should == 12
+    @parsed.method.should == 'something'
+  end
+end

data/spec/dirge_spec.rb

@@ -1,22 +1,26 @@
 describe 'Dirge' do
+  before do
+    @dir = 'test2test'
+  end
   it "should resolve a path through String#~" do
-    (~'test:2test/test').should == File.expand_path(File.join(File.dirname(__FILE__), 'test:2test', 'test'))
+    (~"#{@dir}/test").should == File.expand_path(File.join(File.dirname(__FILE__), @dir, 'test'))
   end
   
   it "should resolve a path through File#relative" do
-    File.relative('test:2test/test').should == File.expand_path(File.join(File.dirname(__FILE__), 'test:2test', 'test'))
+    File.relative("#{@dir}/test").should == File.expand_path(File.join(File.dirname(__FILE__), @dir, 'test'))
   end
   
   it 'should require a relative path' do
     proc {
-      require_relative 'test:2test/test'
+      require_relative "#{@dir}/test"
     }.should raise_error(RuntimeError, 'okay okay, you included me')
   end
   
   it 'should autoload a relative path' do
+    dir = @dir
     proc {
       mod = Module.new do
-        autoload_relative :TestingTime, 'test:2test/test'
+        autoload_relative :TestingTime, "#{dir}/test"
       end
       mod::TestingTime
     }.should raise_error(RuntimeError, 'okay okay, you included me')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: callsite
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -04:00
+date: 2010-07-22 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - Rakefile
 - VERSION
 - callsite.gemspec
+- ext/gem_rake.rb
 - lib/callsite.rb
 - lib/callsite/version.rb
 - lib/dirge.rb
@@ -39,6 +40,7 @@ files:
 - lib/loaders/kernel_dir.rb
 - lib/loaders/kernel_require.rb
 - lib/loaders/load_path.rb
+- spec/callsite_spec.rb
 - spec/data/dir1/file1
 - spec/data/dir1/test.rb
 - spec/data/dir1/test2.rb
@@ -48,7 +50,7 @@ files:
 - spec/dirge_spec.rb
 - spec/load_path_find_spec.rb
 - spec/spec.opts
-- spec/test:2test/test.rb
+- spec/test2test/test.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/callsite
 licenses: []
@@ -84,6 +86,7 @@ signing_key:
 specification_version: 3
 summary: Caller/backtrace parser with some useful utilities for manipulating the load path, and doing other relative things.
 test_files: 
+- spec/callsite_spec.rb
 - spec/data/dir1/file1
 - spec/data/dir1/test.rb
 - spec/data/dir1/test2.rb
@@ -93,4 +96,4 @@ test_files:
 - spec/dirge_spec.rb
 - spec/load_path_find_spec.rb
 - spec/spec.opts
-- spec/test:2test/test.rb
+- spec/test2test/test.rb