rhubarb 0.4.0 → 0.4.2

data/Rakefile

@@ -46,11 +46,11 @@ def name
 end
 
 def pkg_name
-  return "ruby-" + name()
+  "ruby-#{name}"
 end
 
 def pkg_spec
-  return pkg_name() + ".spec"
+  "#{pkg_name}.spec"
 end
 
 def pkg_rel
@@ -58,7 +58,7 @@ def pkg_rel
 end
 
 def pkg_source
-  return pkg_name() + "-" + pkg_version() + "-" + pkg_rel() + ".tar.gz"
+  return "#{pkg_name}-#{pkg_version}.tar.gz"
 end
 
 def pkg_dir
@@ -69,8 +69,27 @@ def rpm_dirs
   return %w{BUILD BUILDROOT RPMS SOURCES SPECS SRPMS}
 end
 
+def package_prefix
+  "#{pkg_name}-#{pkg_version}"
+end
+
+def pristine_name
+  "#{package_prefix}.tar.gz"
+end
+
+desc "upload a pristine tarball for the current release to fedorahosted"
+task :upload_pristine => [:pristine] do
+  raise "Please set FH_USERNAME" unless ENV['FH_USERNAME']
+  sh "scp #{pristine_name} #{ENV['FH_USERNAME']}@fedorahosted.org:grid"
+end
+
+desc "generate a pristine tarball for the tag corresponding to the current version"
+task :pristine do
+  sh "git archive --format=tar v#{pkg_version} --prefix=#{package_prefix}/ | gzip -9nv > #{pristine_name}"
+end
+
 desc "create RPMs"
-task :rpms => [:build, :tarball, :gen_spec] do
+task :rpms => [:tarball, :gen_spec] do
   FileUtils.cp pkg_spec(), 'SPECS'
   sh "rpmbuild --define=\"_topdir \${PWD}\" -ba SPECS/#{pkg_spec}"
 end
@@ -81,11 +100,8 @@ task :gen_spec do
 end
 
 desc "Create a tarball"
-task :tarball => [:make_rpmdirs, :gen_spec] do
-  FileUtils.cp_r 'lib', pkg_dir()
-  FileUtils.cp ['LICENSE', 'README.rdoc', 'CHANGES', 'TODO', 'VERSION'], pkg_dir()
-  sh "tar -cf #{pkg_source} #{pkg_dir}"
-  FileUtils.mv pkg_source(), 'SOURCES'
+task :tarball => [:make_rpmdirs, :pristine] do
+  FileUtils.cp pristine_name, 'SOURCES'
 end
 
 desc "Make dirs for building RPM"

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/lib/rhubarb/persistence.rb

@@ -70,7 +70,7 @@ module Rhubarb
     end
 
     def self.sqlite_13
-      result = SQLite3.constants.include?("VERSION") && SQLite3::VERSION =~ /1\.3\.[0-9]+/
+      result = (SQLite3.constants.include?("VERSION") || SQLite3.constants.include?(:VERSION)) && SQLite3::VERSION =~ /1\.3\.[0-9]+/
       !!result
     end
 

data/ruby-rhubarb.spec.in

@@ -1,24 +1,38 @@
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%define rel 3
+
+%if (0%{?fedora} == 0 && 0%{?rhel} <= 5)
+%global building_for_el5 1
+%else
+%global building_for_el5 0
+%endif
+
+%if (0%{?fedora} >= 17)
+%global ruby_abi 1.9.1
+%else
+%global ruby_abi 1.8
+%endif
 
 Summary: Simple versioned object-graph persistence layer
 Name: ruby-rhubarb
 Version: RHUBARB_VERSION
-Release: %{rel}%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: ASL 2.0
 URL: http://git.fedorahosted.org/git/grid/rhubarb.git
-Source0: %{name}-%{version}-%{rel}.tar.gz
+Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: ruby-sqlite3
 Requires: ruby
-Requires: ruby(abi) = 1.8
+Requires: ruby(abi) = %{?ruby_abi}
+Provides: ruby(rhubarb/rhubarb)
 BuildRequires: ruby
 BuildArch: noarch
 
 %description
-A simple versioned object-graph persistence layer that stores
-instances of specially-declared Ruby classes in a SQLite3 database
+Rhubarb is a simple object-graph persistence layer that stores
+instances of specially-declared Ruby classes in a SQLite3 database.  
+Notably, it supports multiple versions of objects and relationships
+and plays nicely with the SPQR object publishing framework.
 
 %prep
 %setup -q
@@ -26,28 +40,43 @@ instances of specially-declared Ruby classes in a SQLite3 database
 %build
 
 %install
+%if %{building_for_el5}
 rm -rf %{buildroot}
+%endif
 mkdir -p %{buildroot}/%{ruby_sitelib}/rhubarb
 mkdir -p %{buildroot}/%{ruby_sitelib}/rhubarb/mixins
 cp -p -f lib/rhubarb/mixins/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb/mixins
 cp -p -f lib/rhubarb/*.rb %{buildroot}/%{ruby_sitelib}/rhubarb
 
+%if %{building_for_el5}
 %clean
 rm -rf %{buildroot}
+%endif
 
 %files
+%if %{building_for_el5}
 %defattr(-, root, root, -)
+%endif
 %doc LICENSE README.rdoc CHANGES TODO VERSION
-%{ruby_sitelib}/rhubarb/rhubarb.rb
-%{ruby_sitelib}/rhubarb/classmixins.rb
-%{ruby_sitelib}/rhubarb/mixins/freshness.rb
-%{ruby_sitelib}/rhubarb/column.rb
-%{ruby_sitelib}/rhubarb/reference.rb
-%{ruby_sitelib}/rhubarb/util.rb
-%{ruby_sitelib}/rhubarb/persisting.rb
-%{ruby_sitelib}/rhubarb/persistence.rb
+%{ruby_sitelib}/rhubarb/
 
 %changelog
+
+* Wed Feb 8 2011 willb <willb@redhat> - 0.4.2-1
+- Fixes for running under Ruby 1.9
+
+* Tue Oct 11 2011 willb <willb@redhat> - 0.4.1-1
+- Updated to version 0.4.1, which exclusively includes build workflow improvements
+
+* Wed Sep 21 2011 willb <willb@redhat> - 0.4.0-3
+- specfile changes:  conditionalized out all EL5 stuff
+
+* Fri Sep 16 2011 willb <willb@redhat> - 0.4.0-2
+- minor specfile changes.
+
+* Wed Jul 6 2011 willb <willb@redhat> - 0.4.0-1
+- now works with sqlite3-ruby 1.3.x (BZ 718016)
+
 * Mon Jun 6 2011 willb <willb@redhat> - 0.3.0-3
 - installation now preserves file modification times
 

data/test/test_rhubarb.rb

@@ -285,7 +285,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
   def test_instance_methods
     ["foo", "bar"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        assert TestClass.instance_methods.include?(m), "#{m} method not declared in TestClass"
+        assert TestClass.method_defined?(m), "#{m} method not declared in TestClass"
       end
     end
   end
@@ -293,7 +293,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
   def test_instance_methods2
     ["fred", "barney"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        assert TestClass2.instance_methods.include?(m), "#{m} method not declared in TestClass2"
+        assert TestClass2.method_defined?(m), "#{m} method not declared in TestClass2"
       end
     end
   end
@@ -301,7 +301,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
   def test_instance_methods_neg
     ["fred", "barney"].each do |prefix|
       ["#{prefix}", "#{prefix}="].each do |m|
-        bogus_include = TestClass.instance_methods.include? m
+        bogus_include = TestClass.method_defined? m
         assert(bogus_include == false, "#{m} method declared in TestClass; shouldn't be")
       end
     end
@@ -345,7 +345,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
   def test_instance_methods_dont_include_class_methods
     ["foo", "bar"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
-        bogus_include = TestClass.instance_methods.include? m
+        bogus_include = TestClass.method_defined? m
         assert(bogus_include == false, "#{m} method declared in TestClass; shouldn't be")
       end
     end
@@ -362,7 +362,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
     ["foo", "bar"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass; self end
-        assert klass.instance_methods.include?(m), "#{m} method not declared in TestClass' eigenclass"
+        assert klass.method_defined?(m), "#{m} method not declared in TestClass' eigenclass"
       end
     end
   end
@@ -371,7 +371,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
     ["fred", "barney"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass2; self end
-        assert klass.instance_methods.include?(m), "#{m} method not declared in TestClass2's eigenclass"
+        assert klass.method_defined?(m), "#{m} method not declared in TestClass2's eigenclass"
       end
     end
   end
@@ -385,7 +385,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
           include Rhubarb::Persisting
         end
 
-        bogus_include = klass.instance_methods.include?(m)
+        bogus_include = klass.method_defined?(m)
         assert(bogus_include == false, "#{m} method declared in eigenclass of class including Rhubarb::Persisting; shouldn't be")
       end
     end
@@ -395,7 +395,7 @@ class NoPreparedStmtBackendTests < Test::Unit::TestCase
     ["fred", "barney"].each do |prefix|
       ["find_by_#{prefix}", "find_first_by_#{prefix}"].each do |m|
         klass = class << TestClass; self end
-        bogus_include = klass.instance_methods.include?(m)
+        bogus_include = klass.method_defined?(m)
         assert(bogus_include == false, "#{m} method declared in TestClass' eigenclass; shouldn't be")
       end
     end

metadata

@@ -1,66 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhubarb
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - William Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &12227480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *12227480
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &12223920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
-  version_requirements: *id002
-description: Rhubarb is a simple object-graph persistence library implemented as a mixin.  It also works with the SPQR library for straightforward object publishing over QMF.
+  prerelease: false
+  version_requirements: *12223920
+description: Rhubarb is a simple object-graph persistence library implemented as a
+  mixin.  It also works with the SPQR library for straightforward object publishing
+  over QMF.
 email: willb@redhat.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
 - CHANGES
 - LICENSE
@@ -76,44 +59,31 @@ files:
 - lib/rhubarb/reference.rb
 - lib/rhubarb/rhubarb.rb
 - lib/rhubarb/util.rb
-- rhubarb.gemspec
 - ruby-rhubarb.spec.in
 - test/helper.rb
 - test/test_rhubarb.rb
-has_rdoc: true
 homepage: http://git.fedorahosted.org/git/grid/rhubarb.git
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: "Rhubarb:  object graph persistence, easy as pie"
-test_files: 
-- test/helper.rb
-- test/test_rhubarb.rb
+summary: ! 'Rhubarb:  object graph persistence, easy as pie'
+test_files: []

data/rhubarb.gemspec

@@ -1,66 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rhubarb}
-  s.version = "0.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["William Benton"]
-  s.date = %q{2011-07-06}
-  s.description = %q{Rhubarb is a simple object-graph persistence library implemented as a mixin.  It also works with the SPQR library for straightforward object publishing over QMF.}
-  s.email = %q{willb@redhat.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc",
-    "TODO"
-  ]
-  s.files = [
-    ".document",
-    "CHANGES",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "lib/rhubarb/classmixins.rb",
-    "lib/rhubarb/column.rb",
-    "lib/rhubarb/mixins/freshness.rb",
-    "lib/rhubarb/persistence.rb",
-    "lib/rhubarb/persisting.rb",
-    "lib/rhubarb/reference.rb",
-    "lib/rhubarb/rhubarb.rb",
-    "lib/rhubarb/util.rb",
-    "rhubarb.gemspec",
-    "ruby-rhubarb.spec.in",
-    "test/helper.rb",
-    "test/test_rhubarb.rb"
-  ]
-  s.homepage = %q{http://git.fedorahosted.org/git/grid/rhubarb.git}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Rhubarb:  object graph persistence, easy as pie}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_rhubarb.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.2"])
-  end
-end
-