muack 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af70a254e2da3b9b4e1c876f9487a597ddf3f897
-  data.tar.gz: b5ae8e833a730c0547f9d4d3b3b10b2b8beb9732
+  metadata.gz: 0f70136437354cf553340e7a4502e6fc4056802e
+  data.tar.gz: 4f73fe1b681f0e6b4b837f89e72865a008f721af
 SHA512:
-  metadata.gz: 94b296d5a7026b2702cf247ba45fbcacb9e5bf8ee107247100d39b5c1c8ae1458bf8c8d7695ffd123006a4200425ef45d33bcd9ae03ce0846a8573b422f22ee7
-  data.tar.gz: 79191de263d9aab1a4f23927c0d7e13dd3a1b58e1cfa6668b22c07f2d22874e29adf048c340e7ca73377e3975f3a70118625d1208fc6e1f43375adc9887ac46a
+  metadata.gz: 832585b3ec72cf71fdd5fd1a607034ddd999e509d03e8239037fc2bb7a3a9d1637996a09ec2e1d2d45ace2539d3b8d4ee5c6877df02ed3a0113e3e2f125d8869
+  data.tar.gz: c9c64a40ec5c10d2cbdf30d17c3952b857915160f7599f8a2258db88ad53d668d75c5f493399d0f315c811d9164ab41267498b329fa2bf8202f2f0dcfe93893f

data/.gitignore

@@ -1,2 +1,2 @@
-pkg
+/pkg/
 *.rbc

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## Muack 0.7.3 -- 2013-10-01
+
+* Added `Muack::API.including(element)` for detecting if the underlying
+  element is included in the passed argument.
+
 ## Muack 0.7.2 -- 2013-08-23
 
 * Show correct Expected error for special satisfiers. Previously, it would

data/README.md

@@ -18,6 +18,11 @@ It's 32x times faster (750s vs 23s) for running [Rib][] tests.
 [RR]: https://github.com/rr/rr
 [Rib]: https://github.com/godfat/rib
 
+## WHY?
+
+Because RR has/had some bugs and it is too complex for me to fix it.
+Muack is much simpler and thus much faster and less likely to have bugs.
+
 ## REQUIREMENTS:
 
 * Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.

data/Rakefile

@@ -3,21 +3,12 @@ begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
   sh 'git submodule update --init'
-  exec Gem.ruby, '-S', 'rake', *ARGV
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.dir = dir
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib")).uniq!
-
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    require 'muack/version'
-    s.name    = 'muack'
-    s.version = Muack::VERSION
-
-    %w[].each{ |g| s.add_runtime_dependency(g) }
-  end
-
-  Gemgem.write
+Gemgem.init(dir) do |s|
+  require 'muack/version'
+  s.name    = 'muack'
+  s.version = Muack::VERSION
+  %w[].each{ |g| s.add_runtime_dependency(g) }
 end

data/lib/muack.rb

@@ -57,6 +57,10 @@ module Muack
       Muack::HashIncluding.new(hash)
     end
 
+    def including element
+      Muack::Including.new(element)
+    end
+
     def within range_or_array
       Muack::Within.new(range_or_array)
     end

data/lib/muack/satisfy.rb

@@ -70,6 +70,13 @@ module Muack
     end
   end
 
+  class Including < Satisfy
+    def initialize element
+      super lambda{ |actual_arg|
+        actual_arg.include?(element) }, [element]
+    end
+  end
+
   class Within < Satisfy
     def initialize range_or_array
       super lambda{ |actual_arg| range_or_array.include?(actual_arg) },

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/muack.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
+# stub: muack 0.7.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "muack"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-08-23"
+  s.date = "2013-10-01"
   s.description = "Muack -- Yet another mocking library.\n\nBasically it's an [RR][] clone, but much faster under heavy use.\nIt's 32x times faster (750s vs 23s) for running [Rib][] tests.\n\n[RR]: https://github.com/rr/rr\n[Rib]: https://github.com/godfat/rib"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -43,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/godfat/muack"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.1.5"
   s.summary = "Muack -- Yet another mocking library."
   s.test_files = [
   "test/test_any_instance_of.rb",

data/task/gemgem.rb

@@ -1,14 +1,26 @@
 
-require 'pathname'
-
 module Gemgem
   class << self
-    attr_accessor :dir, :spec
+    attr_accessor :dir, :spec, :spec_create
   end
 
   module_function
+  def gem_tag    ; "#{spec.name}-#{spec.version}"     ; end
+  def gem_path   ; "#{pkg_dir}/#{gem_tag}.gem"        ; end
+  def spec_path  ; "#{dir}/#{spec.name}.gemspec"      ; end
+  def pkg_dir    ; "#{dir}/pkg"                       ; end
+  def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
+
+  def init dir, &block
+    self.dir = dir
+    $LOAD_PATH.unshift("#{dir}/lib")
+    ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
+    ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.spec_create = block
+  end
+
   def create
-    yield(spec = Gem::Specification.new{ |s|
+    spec = Gem::Specification.new do |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
@@ -16,163 +28,146 @@ module Gemgem
       s.summary     = description.first
       s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
 
-      s.rubygems_version = Gem::VERSION
-      s.date             = Time.now.strftime('%Y-%m-%d')
-      s.files            = gem_files
-      s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
-      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
-      s.require_paths    = %w[lib]
-    })
-    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
-    spec
+      s.date        = Time.now.strftime('%Y-%m-%d')
+      s.files       = gem_files
+      s.test_files  = test_files
+      s.executables = bin_files
+    end
+    spec_create.call(spec)
+    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    self.spec = spec
   end
 
-  def readme
-    path = %w[README.md README].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @readme ||=
-      if path
-        ps = "##{File.read(path)}".
-             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
-        ps.inject('HEADER' => ps.first){ |r, s, i|
-          r[s[/\w+/]] = s
-          r
-        }
+  def write
+    File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
+  end
+
+  def split_lines ruby
+    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
+      if $2.index(',')
+        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
       else
-        {}
+        s
       end
+    }
   end
 
-  def description
-    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines
+  def strip_path path
+    strip_home_path(strip_cwd_path(path))
   end
 
-  def changes
-    path = %w[CHANGES.md CHANGES].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @changes ||=
-      if path
-        date = '\d+{4}\-\d+{2}\-\d{2}'
-        File.read(path).match(
-          /([^\n]+#{date}\n\n(.+?))(?=\n\n[^\n]+#{date}\n|\Z)/m)[1]
-      else
-        ''
-      end
+  def strip_home_path path
+    path.sub(ENV['HOME'], '~')
   end
 
-  def ann_md
-     "#{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
-    "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
-    "### CHANGES:\n\n"                                                     \
-    "###{changes}\n\n"                                                     \
-    "##{readme['INSTALLATION']}\n\n"                                       +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS'][/[^\n]+\n\n[^\n]+/]}"
-    else '' end
+  def strip_cwd_path path
+    path.sub(Dir.pwd, '.')
   end
 
-  def ann_html
-    gem 'nokogiri'
-    gem 'kramdown'
-
-    IO.popen('kramdown', 'r+') do |md|
-      md.puts Gemgem.ann_md
-      md.close_write
-      require 'nokogiri'
-      html = Nokogiri::XML.parse("<gemgem>#{md.read}</gemgem>")
-      html.css('*').each{ |n| n.delete('id') }
-      html.root.children.to_html
-    end
+  def git *args
+    `git --git-dir=#{dir}/.git #{args.join(' ')}`
   end
 
-  def ann_email
-    "#{readme['HEADER'].sub(/([\w\-]+)/, "\\1 <#{spec.homepage}>")}\n\n" \
-    "#{readme['DESCRIPTION']}\n\n"                                       \
-    "#{readme['INSTALLATION']}\n\n"                                      +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}\n\n" else '' end  +
-    "## CHANGES:\n\n"                                                    \
-    "##{changes}\n\n"
+  def sh_git *args
+    Rake.sh('git', "--git-dir=#{dir}/.git", *args)
   end
 
-  def gem_tag
-    "#{spec.name}-#{spec.version}"
+  def sh_gem *args
+    Rake.sh(Gem.ruby, '-S', 'gem', *args)
   end
 
-  def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
-      f << split_lines(spec.to_ruby) }
+  def glob path=dir
+    Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
   end
 
-  def split_lines ruby
-    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
-      if $2.index(',')
-        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+  def readme
+    @readme ||=
+      if (path = "#{Gemgem.dir}/README.md") && File.exist?(path)
+        ps = "##{File.read(path)}".
+             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
+        ps.inject('HEADER' => ps.first){ |r, s, i|
+          r[s[/\w+/]] = s
+          r
+        }
       else
-        s
+        {}
       end
-    }
+  end
+
+  def description
+    # JRuby String#lines is returning an enumerator
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
   def all_files
-    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/|\.git$}
-        nil
+    @all_files ||= fold_files(glob).sort
+  end
+
+  def fold_files files
+    files.inject([]){ |r, path|
+      if File.file?(path) && path !~ %r{/\.git(/|$)}  &&
+         (rpath = path[%r{^#{escaped_dir}/(.*$)}, 1])
+        r << rpath
+      elsif File.symlink?(path) # walk into symlinks...
+        r.concat(fold_files(glob(File.expand_path(path,
+                                                  File.readlink(path)))))
       else
-        file.to_s
+        r
       end
-    }.compact.sort
+    }
   end
 
   def gem_files
-    @gem_files ||= all_files - ignored_files
+    @gem_files ||= all_files.reject{ |f|
+      f =~ ignored_pattern && !git_files.include?(f)
+    }
   end
 
-  def ignored_files
-    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
-      path =~ ignore && !git_files.include?(path)}}
+  def test_files
+    @test_files ||= gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+  end
+
+  def bin_files
+    @bin_files ||= gem_files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   end
 
   def git_files
     @git_files ||= if File.exist?("#{dir}/.git")
-                     `git ls-files`.split("\n")
+                     git('ls-files').split("\n")
                    else
                      []
                    end
   end
 
-  # protected
-  def find_files path
-    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
-    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  def ignored_files
+    @ignored_files ||= all_files.grep(ignored_pattern)
   end
 
-  def ignore_patterns
-    @ignore_files ||= expand_patterns(
-      gitignore.split("\n").reject{ |pattern|
-        pattern.strip == ''
-      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  def ignored_pattern
+    @ignored_pattern ||= Regexp.new(expand_patterns(gitignore).join('|'))
   end
 
   def expand_patterns pathes
-    pathes.map{ |path|
-      if path !~ /\*/
-        path
-      else
-        expand_patterns(
-          Dir[path] +
-          Pathname.new(File.dirname(path)).children.select(&:directory?).
-            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
+    # http://git-scm.com/docs/gitignore
+    pathes.flat_map{ |path|
+      case path
+      when %r{\*}
+        Regexp.escape(path).gsub(/\\\*/, '[^/]*')
+      when %r{^/}
+        "^#{Regexp.escape(path[1..-1])}"
+      else # we didn't implement negative pattern for now
+        Regexp.escape(path)
       end
-    }.flatten
+    }
   end
 
   def gitignore
-    if File.exist?(path = "#{dir}/.gitignore")
-      File.read(path)
-    else
-      ''
-    end
+    @gitignore ||= if File.exist?(path = "#{dir}/.gitignore")
+                     File.read(path).lines.
+                       reject{ |l| l == /^\s*(#|\s+$)/ }.map(&:strip)
+                   else
+                     []
+                   end
   end
 end
 
@@ -180,22 +175,37 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.sh_gem('install', Gemgem.gem_path)
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
-  sh("mkdir -p pkg")
-  sh("mv #{Gemgem.gem_tag}.gem pkg/")
+  require 'fileutils'
+  require 'rubygems/package'
+  gem = nil
+  Dir.chdir(Gemgem.dir) do
+    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
+    FileUtils.mkdir_p(Gemgem.pkg_dir)
+    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
+  end
+  puts "\e[35mGem built: \e[33m" \
+       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+end
+
+desc 'Generate gemspec'
+task :spec do
+  Gemgem.create
+  Gemgem.write
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  sh("git tag #{Gemgem.gem_tag}")
-  sh("git push")
-  sh("git push --tags")
-  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.module_eval do
+    sh_git('tag', Gemgem.gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', Gemgem.gem_path)
+  end
 end
 
 task :check do
@@ -218,51 +228,37 @@ end # of gem namespace
 
 desc 'Run tests in memory'
 task :test do
+  next if Gemgem.test_files.empty?
+
   require 'bacon'
   Bacon.extend(Bacon::TestUnitOutput)
   Bacon.summary_on_exit
-  $LOAD_PATH.unshift('lib')
-  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
-end
-
-desc 'Run tests with shell'
-task 'test:shell', :RUBY_OPTS do |t, args|
-  files = Dir['test/**/test_*.rb'].join(' ')
-
-  cmd = [Gem.ruby, args[:RUBY_OPTS],
-         '-I', 'lib', '-S', 'bacon', '--quiet', files]
-
-  sh(cmd.compact.join(' '))
+  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
 end
 
-desc 'Generate ann markdown'
-task 'ann:md' => ['gem:spec'] do
-  puts Gemgem.ann_md
-end
+desc 'Remove ignored files'
+task :clean => ['gem:spec'] do
+  next if Gemgem.ignored_files.empty?
 
-desc 'Generate ann html'
-task 'ann:html' => ['gem:spec'] do
-  puts Gemgem.ann_html
-end
+  require 'fileutils'
+  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
+  puts "Move the following files into:" \
+       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
 
-desc 'Generate ann email'
-task 'ann:email' => ['gem:spec'] do
-  puts Gemgem.ann_email
-end
+  Gemgem.ignored_files.each do |file|
+    from = "#{Gemgem.dir}/#{file}"
+    to   = "#{trash}/#{File.dirname(file)}"
+    puts Gemgem.strip_path(from)
 
-desc 'Generate rdoc'
-task :doc => ['gem:spec'] do
-  sh("yardoc -o rdoc --main README.md" \
-     " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
-end
+    FileUtils.mkdir_p(to)
+    FileUtils.mv(from, to)
+  end
 
-desc 'Remove ignored files'
-task :clean => ['gem:spec'] do
-  trash = "~/.Trash/#{Gemgem.spec.name}/"
-  sh "mkdir -p #{trash}" unless File.exist?(File.expand_path(trash))
-  Gemgem.ignored_files.each{ |file| sh "mv #{file} #{trash}" }
+  print "\e[0m"
 end
 
 task :default do
-  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+  # Is there a reliable way to do this in the current process?
+  # It failed miserably before between Rake versions...
+  exec "#{Gem.ruby} -S #{$PROGRAM_NAME} -f #{Rake.application.rakefile} -T"
 end

data/test/test_satisfy.rb

@@ -131,6 +131,37 @@ describe Muack::Satisfy do
     end
   end
 
+  describe Muack::Including do
+    should 'have human readable to_s and inspect' do
+      matcher = including(2)
+      expected = 'Muack::API.including(2)'
+      matcher.to_s   .should.eq expected
+      matcher.inspect.should.eq expected
+    end
+
+    should 'satisfy' do
+      mock(Str).say(including(2)){ |arg| arg.first }
+      Str.say([1, 2]).should.eq 1
+      Muack.verify.should.eq true
+      Muack::EnsureReset.call
+    end
+
+    should 'raise Unexpected error if passing unexpected argument' do
+      mock(Obj).say(including(2)){ 'boo' }
+      begin
+        Obj.say([1])
+        'never'.should.eq 'reach'
+      rescue Muack::Unexpected => e
+        e.expected.should.eq 'obj.say(Muack::API.including(2))'
+        e.was     .should.eq 'obj.say([1])'
+        e.message .should.eq "\nExpected: #{e.expected}\n but was: #{e.was}"
+      ensure
+        Muack.reset
+        Muack::EnsureReset.call
+      end
+    end
+  end
+
   describe Muack::Within do
     should 'have human readable to_s and inspect' do
       matcher = within(0..9)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- Yet another mocking library.
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Muack -- Yet another mocking library.