manveru-makura 2009.03.01 → 2009.03.28

data/Rakefile

@@ -0,0 +1,32 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+require 'time'
+require 'date'
+
+PROJECT_SPECS = Dir['spec/**/*.rb']
+PROJECT_MODULE = 'Makura'
+
+GEMSPEC = Gem::Specification.new{|s|
+  s.name         = 'makura'
+  s.author       = "Michael 'manveru' Fellinger"
+  s.summary      = "Ruby wrapper around the CouchDB REST API."
+  s.description  = "Ruby wrapper around the CouchDB REST API."
+  s.email        = 'm.fellinger@gmail.com'
+  s.homepage     = 'http://github.com/manveru/makura'
+  s.platform     = Gem::Platform::RUBY
+  s.version      = (ENV['PROJECT_VERSION'] || Date.today.strftime("%Y.%m.%d"))
+  s.files        = `git ls-files`.split("\n").sort
+  s.has_rdoc     = true
+  s.require_path = 'lib'
+  s.executables = ['makura']
+  s.bindir = "bin"
+
+  s.add_runtime_dependency('rest-client', '>= 0.8.1')
+}
+
+Dir['tasks/*.rake'].each{|f| import(f) }
+
+task :default => [:bacon]
+
+CLEAN.include('')

data/example/blog.rb

@@ -13,9 +13,6 @@ class Post
 
   layout :all
 
-  validates(:title){ presence and length :within => (3..100) }
-  validates(:text){ presence }
-
   save # submit design docs to CouchDB
 end
 

data/lib/makura.rb

@@ -10,7 +10,6 @@ require 'rest_client'
 require 'json'
 
 module Makura
-  VERSION = '2008.01.15'
   ROOT = File.expand_path(File.dirname(__FILE__))
 end
 
@@ -18,6 +17,7 @@ unless $LOAD_PATH.any?{|lp| File.expand_path(lp) == Makura::ROOT }
   $LOAD_PATH.unshift(Makura::ROOT)
 end
 
+require 'makura/version'
 require 'makura/error'
 require 'makura/http_methods'
 require 'makura/server'

data/lib/makura/database.rb

@@ -144,7 +144,7 @@ module Makura
     end
 
     def view(layout, params = {})
-      get("_view/#{layout}", params)
+      get("_design/#{layout}", params)
     end
 
     def save(doc)
@@ -210,7 +210,7 @@ module Makura
     end
 
     def inspect
-      "#<Makura::Database '#{@server.uri(name)}'>"
+      "#<Makura::Database '#{@server.uri(name || '/')}'>"
     end
   end
 end

data/lib/makura/model.rb

@@ -84,13 +84,8 @@ module Makura
         ["#<#{self.class} ", @_hash, ">"].each{|e| e.pretty_print(o) }
       end
 
-      def saved?
-        self['_rev']
-      end
-
       def save
         return if not valid? if respond_to?(:valid)
-        return if saved?
         save!
       end
 
@@ -321,7 +316,7 @@ module Makura
 
       def multi_fetch(name, opts = {})
         keys = opts.delete(:keys) || opts.delete('keys')
-        opts.merge!(:payload => {'keys' => keys.to_a})
+        opts.merge!(:payload => {'keys' => Array(keys)})
         hash = database.post("_view/#{self}/#{name}", opts)
         convert_raw(hash['rows'])
       end
@@ -345,7 +340,7 @@ module Makura
 
       def view(name, opts = {})
         flat = opts.delete(:flat)
-        hash = database.view("#{self}/#{name}", opts)
+        hash = database.view("#{self}/_view/#{name}", opts)
 
         convert_raw(hash['rows'], flat)
       end

data/lib/makura/version.rb

@@ -0,0 +1,3 @@
+module Makura
+  VERSION = "2009.03.28"
+end

data/makura.gemspec

@@ -1,42 +1,33 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name = "makura"
-  s.version = "2009.03.01"
+  s.name = %q{makura}
+  s.version = "2009.03.28"
 
-  s.summary = "Ruby wrapper around the CouchDB REST API."
-  s.description = "Ruby wrapper around the CouchDB REST API."
-  s.platform = "ruby"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Michael 'manveru' Fellinger"]
+  s.date = %q{2009-03-28}
+  s.default_executable = %q{makura}
+  s.description = %q{Ruby wrapper around the CouchDB REST API.}
+  s.email = %q{m.fellinger@gmail.com}
+  s.executables = ["makura"]
+  s.files = ["COPYING", "README.md", "Rakefile", "bin/makura", "example/blog.rb", "example/couch/map/author_all.js", "example/couch/map/author_posts.js", "example/couch/map/post_all.js", "example/couch/map/post_comments.js", "example/couch/reduce/sum_length.js", "lib/makura.rb", "lib/makura/database.rb", "lib/makura/design.rb", "lib/makura/error.rb", "lib/makura/http_methods.rb", "lib/makura/layout.rb", "lib/makura/model.rb", "lib/makura/plugin/localize.rb", "lib/makura/plugin/pager.rb", "lib/makura/server.rb", "lib/makura/uuid_cache.rb", "lib/makura/version.rb", "makura.gemspec", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake"]
   s.has_rdoc = true
-  s.author = "Michael 'manveru' Fellinger"
-  s.email = "m.fellinger@gmail.com"
-  s.homepage = "http://github.com/manveru/makura"
-  s.executables = ['makura']
-  s.bindir = "bin"
-  s.require_path = "lib"
+  s.homepage = %q{http://github.com/manveru/makura}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Ruby wrapper around the CouchDB REST API.}
 
-  s.add_dependency('rest-client', '>= 0.8.1')
-  s.add_dependency('json', '>= 1.1.3')
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-  s.files = [
-    "COPYING",
-    "README.md",
-    "bin/makura",
-    "example/blog.rb",
-    "example/couch/map/author_all.js",
-    "example/couch/map/author_posts.js",
-    "example/couch/map/post_all.js",
-    "example/couch/map/post_comments.js",
-    "example/couch/reduce/sum_length.js",
-    "lib/makura.rb",
-    "lib/makura/database.rb",
-    "lib/makura/design.rb",
-    "lib/makura/error.rb",
-    "lib/makura/http_methods.rb",
-    "lib/makura/layout.rb",
-    "lib/makura/model.rb",
-    "lib/makura/plugin/localize.rb",
-    "lib/makura/plugin/pager.rb",
-    "lib/makura/server.rb",
-    "lib/makura/uuid_cache.rb",
-    "makura.gemspec"
-  ]
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 0.8.1"])
+    else
+      s.add_dependency(%q<rest-client>, [">= 0.8.1"])
+    end
+  else
+    s.add_dependency(%q<rest-client>, [">= 0.8.1"])
+  end
 end

data/tasks/bacon.rake

@@ -0,0 +1,49 @@
+desc 'Run all bacon specs with pretty output'
+task :bacon => :install_dependencies do
+  require 'open3'
+  require 'scanf'
+
+  specs = PROJECT_SPECS
+
+  some_failed = false
+  total = specs.size
+  len = specs.map{|s| s.size }.sort.last
+  tt = ta = tf = te = 0
+
+  red, yellow, green = "\e[31m%s\e[0m", "\e[33m%s\e[0m", "\e[32m%s\e[0m"
+  left_format = "%4d/%d: %-#{len + 11}s"
+  spec_format = "%d specifications (%d requirements), %d failures, %d errors"
+
+  specs.each_with_index do |spec, idx|
+    print(left_format % [idx + 1, total, spec])
+
+    Open3.popen3(RUBY, spec) do |sin, sout, serr|
+      out = sout.read
+      err = serr.read
+
+      ran = false
+
+      out.each_line do |line|
+        tests, assertions, failures, errors = all = line.scanf(spec_format)
+        next unless all.any?
+        ran = true
+        tt += tests; ta += assertions; tf += failures; te += errors
+
+        if tests == 0 || failures + errors > 0
+          puts((red % spec_format) % all)
+          puts out
+          puts err
+        else
+          puts((green % "%6d passed") % tests)
+        end
+
+        break
+      end
+
+      puts(yellow % "       skipped") unless ran
+    end
+  end
+
+  puts(spec_format % [tt, ta, tf, te])
+  exit 1 if some_failed
+end

data/tasks/changelog.rake

@@ -0,0 +1,18 @@
+desc 'update changelog'
+task :changelog do
+  File.open('CHANGELOG', 'w+') do |changelog|
+    `git log -z --abbrev-commit`.split("\0").each do |commit|
+      next if commit =~ /^Merge: \d*/
+      ref, author, time, _, title, _, message = commit.split("\n", 7)
+      ref    = ref[/commit ([0-9a-f]+)/, 1]
+      author = author[/Author: (.*)/, 1].strip
+      time   = Time.parse(time[/Date: (.*)/, 1]).utc
+      title.strip!
+
+      changelog.puts "[#{ref} | #{time}] #{author}"
+      changelog.puts '', "  * #{title}"
+      changelog.puts '', message.rstrip if message
+      changelog.puts
+    end
+  end
+end

data/tasks/gem.rake

@@ -0,0 +1,22 @@
+require 'rake/gempackagetask'
+
+task :gemspec => [:manifest, :changelog] do
+  gemspec_file = "#{GEMSPEC.name}.gemspec"
+  File.open(gemspec_file, 'w+'){|gs| gs.puts(GEMSPEC.to_ruby) }
+end
+
+desc "package and install from gemspec"
+task :install => [:gemspec] do
+  sh "gem build #{GEMSPEC.name}.gemspec"
+  sh "gem install #{GEMSPEC.name}-#{GEMSPEC.version}.gem"
+end
+
+desc "uninstall the gem"
+task :uninstall => [:clean] do
+  sh %{gem uninstall -x #{GEMSPEC.name}}
+end
+
+Rake::GemPackageTask.new(GEMSPEC) do |p|
+  p.need_tar = true
+  p.need_zip = true
+end

data/tasks/gem_installer.rake

@@ -0,0 +1,76 @@
+task :gem_installer do
+  class GemInstaller
+    def initialize(options = {}, &block)
+      @gems = []
+      @options = options
+
+      run(&block)
+    end
+
+    def run(&block)
+      instance_eval(&block) if block_given?
+    end
+
+    def gem(name, version = nil, options = {})
+      if version.respond_to?(:merge!)
+        options = version
+      else
+        options[:version] = version
+      end
+
+      @gems << [name, options]
+    end
+
+    def setup_gemspec(gemspec)
+      gemspec.dependencies.each do |dependency|
+        dependency.version_requirements.as_list.each do |version|
+          gem(dependency.name, version)
+        end
+      end
+
+      setup
+    end
+
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
+    def setup_gem(name, options, try_install = true)
+      print "activating #{name} ... "
+      Gem.activate(name, *[options[:version]].compact)
+      require(options[:lib] || name)
+      puts "success."
+    rescue LoadError => error
+      puts error
+      install_gem(name, options) if try_install
+      setup_gem(name, options, try_install = false)
+    end
+
+    def install_gem(name, options)
+      installer = Gem::DependencyInstaller.new(options)
+
+      temp_argv(options[:extconf]) do
+        print "Installing #{name} ... "
+        installer.install(name, options[:version])
+        puts "done."
+      end
+    end
+
+    def temp_argv(extconf)
+      if extconf ||= @options[:extconf]
+        old_argv = ARGV.clone
+        ARGV.replace(extconf.split(' '))
+      end
+
+      yield
+
+    ensure
+      ARGV.replace(old_argv) if extconf
+    end
+  end
+end

data/tasks/grancher.rake

@@ -0,0 +1,12 @@
+begin
+  require 'grancher/task'
+
+  Grancher::Task.new do |g|
+    g.branch = 'gh-pages'
+    g.push_to = 'origin'
+    g.message = 'Updated website'
+    g.directory 'ydoc', 'doc'
+  end
+rescue LoadError
+  # oh well :)
+end

data/tasks/install_dependencies.rake

@@ -0,0 +1,6 @@
+desc 'install dependencies'
+task :install_dependencies => [:gem_installer] do
+  GemInstaller.new do
+    setup_gemspec(GEMSPEC)
+  end
+end

data/tasks/manifest.rake

@@ -0,0 +1,4 @@
+desc 'update manifest'
+task :manifest do
+  File.open('MANIFEST', 'w+'){|io| io.puts(*GEMSPEC.files) }
+end

data/tasks/rcov.rake

@@ -0,0 +1,19 @@
+desc 'code coverage'
+task :rcov => :clean do
+  specs = Dir['spec/innate/**/*.rb']
+  specs -= Dir['spec/innate/cache/common.rb']
+
+  # we ignore adapter as this has extensive specs in rack already.
+  ignore = %w[ gem rack bacon innate/adapter\.rb ]
+  ignore << 'fiber\.rb' if RUBY_VERSION < '1.9'
+
+  ignored = ignore.join(',')
+
+  cmd = "rcov --aggregate coverage.data --sort coverage -t --%s -x '#{ignored}' %s"
+
+  while spec = specs.shift
+    puts '', "Gather coverage for #{spec} ..."
+    html = specs.empty? ? 'html' : 'no-html'
+    sh(cmd % [html, spec])
+  end
+end

data/tasks/release.rake

@@ -0,0 +1,12 @@
+desc 'publish to github'
+task :release => [:reversion, :gemspec] do
+  name, version = GEMSPEC.name, GEMSPEC.version
+
+  sh("git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb")
+
+  puts "I added the relevant files, you can now run:", ''
+  puts "git commit -m 'Version #{version}'"
+  puts "git tag -a -m '#{version}' '#{version}'"
+  puts "git push"
+  puts
+end

data/tasks/reversion.rake

@@ -0,0 +1,8 @@
+desc "update version.rb"
+task :reversion do
+  File.open("lib/#{GEMSPEC.name}/version.rb", 'w+') do |file|
+    file.puts("module #{PROJECT_MODULE}")
+    file.puts('  VERSION = %p' % GEMSPEC.version.to_s)
+    file.puts('end')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-makura
 version: !ruby/object:Gem::Version 
-  version: 2009.03.01
+  version: 2009.03.28
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
-default_executable: 
+date: 2009-03-28 00:00:00 -07:00
+default_executable: makura
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
-    version: 
 description: Ruby wrapper around the CouchDB REST API.
 email: m.fellinger@gmail.com
 executables: 
@@ -43,6 +33,7 @@ extra_rdoc_files: []
 files: 
 - COPYING
 - README.md
+- Rakefile
 - bin/makura
 - example/blog.rb
 - example/couch/map/author_all.js
@@ -61,7 +52,18 @@ files:
 - lib/makura/plugin/pager.rb
 - lib/makura/server.rb
 - lib/makura/uuid_cache.rb
+- lib/makura/version.rb
 - makura.gemspec
+- tasks/bacon.rake
+- tasks/changelog.rake
+- tasks/gem.rake
+- tasks/gem_installer.rake
+- tasks/grancher.rake
+- tasks/install_dependencies.rake
+- tasks/manifest.rake
+- tasks/rcov.rake
+- tasks/release.rake
+- tasks/reversion.rake
 has_rdoc: true
 homepage: http://github.com/manveru/makura
 post_install_message: