rpms/rubygem-merb-gen/F-13 import.log, NONE, 1.1 rubygem-merb-gen-1.0.15-fix-tests.patch, NONE, 1.1 rubygem-merb-gen-1.0.15-thor-compat.patch, NONE, 1.1 rubygem-merb-gen.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthew Kent
mkent at fedoraproject.org
Thu Feb 25 06:50:13 UTC 2010
Author: mkent
Update of /cvs/pkgs/rpms/rubygem-merb-gen/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6135/F-13
Modified Files:
.cvsignore sources
Added Files:
import.log rubygem-merb-gen-1.0.15-fix-tests.patch
rubygem-merb-gen-1.0.15-thor-compat.patch
rubygem-merb-gen.spec
Log Message:
- Initial CVS import
--- NEW FILE import.log ---
rubygem-merb-gen-1_0_15-2_fc13:F-13:rubygem-merb-gen-1.0.15-2.fc13.src.rpm:1267080596
rubygem-merb-gen-1.0.15-fix-tests.patch:
Rakefile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE rubygem-merb-gen-1.0.15-fix-tests.patch ---
--- merb-gen-1.0.15_orig/Rakefile 2010-02-15 21:16:05.398609828 -0800
+++ merb-gen-1.0.15/Rakefile 2010-02-15 21:21:07.333653066 -0800
@@ -1,4 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
+#require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
+begin ; require "rubygem" ; rescue LoadError ; end
+require "merb-core"
+require "rake"
+require "rake/gempackagetask"
+require "spec"
+require "spec/rake/spectask"
##############################################################################
# Package && release
rubygem-merb-gen-1.0.15-thor-compat.patch:
main.thor | 38 +++++++++++++++++++++++---------------
ops.rb | 54 ++++++++++++++++++++++++++++--------------------------
2 files changed, 51 insertions(+), 41 deletions(-)
--- NEW FILE rubygem-merb-gen-1.0.15-thor-compat.patch ---
diff -urN merb-gen-1.0.15_orig/lib/generators/templates/application/common/merb_thor/main.thor merb-gen-1.0.15/lib/generators/templates/application/common/merb_thor/main.thor
--- merb-gen-1.0.15_orig/lib/generators/templates/application/common/merb_thor/main.thor 2010-01-19 21:40:44.946040370 -0800
+++ merb-gen-1.0.15/lib/generators/templates/application/common/merb_thor/main.thor 2010-01-19 21:41:08.136063953 -0800
@@ -14,24 +14,28 @@
class Gem < Thor
extend ColorfulMessages
- def initialize
- dirs = [Dir.pwd, File.dirname(__FILE__) / ".."]
- root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")}
-
- if root
- @depsrb = root / "config" / "dependencies.rb"
- else
- self.class.error "dependencies.rb was not found"
- exit!
+ no_tasks do
+ def init
+ dirs = [Dir.pwd, File.dirname(__FILE__) / ".."]
+ root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")}
+
+ if root
+ @depsrb = root / "config" / "dependencies.rb"
+ else
+ self.class.error "dependencies.rb was not found"
+ exit!
+ end
+
+ FileUtils.mkdir_p(Dir.pwd / "gems")
+
+ @list = Collector.collect(File.read(@depsrb))
+ @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications")
end
-
- FileUtils.mkdir_p(Dir.pwd / "gems")
-
- @list = Collector.collect(File.read(@depsrb))
- @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications")
end
+ desc "list", "List dependencies"
def list
+ init
require "pp"
pp @list
end
@@ -41,6 +45,7 @@
"cache. All installed gems that are not in the cache will " \
"be uninstalled."
def redeploy
+ init
gem_dir = Dir.pwd / "gems" / "gems"
cache_dir = Dir.pwd / "gems" / "cache"
@@ -81,6 +86,8 @@
"automatically run this task before committing the " \
"changes it makes."
def confirm(gems = @list)
+ init
+ gems = @list
::Gem.path.replace([Dir.pwd / "gems"])
::Gem.source_index.load_gems_in(Dir.pwd / "gems" / "specifications")
@@ -103,6 +110,7 @@
desc 'install', 'Sync up your bundled gems with the list in config/dependencies.rb'
def install(*gems)
+ init
if gems.empty?
gems = @list
else
@@ -148,4 +156,4 @@
self.class.commit_trans
end
end
-end
\ No newline at end of file
+end
diff -urN merb-gen-1.0.15_orig/lib/generators/templates/application/common/merb_thor/ops.rb merb-gen-1.0.15/lib/generators/templates/application/common/merb_thor/ops.rb
--- merb-gen-1.0.15_orig/lib/generators/templates/application/common/merb_thor/ops.rb 2010-01-19 21:40:44.948040818 -0800
+++ merb-gen-1.0.15/lib/generators/templates/application/common/merb_thor/ops.rb 2010-01-19 21:41:08.151222822 -0800
@@ -1,4 +1,4 @@
-module Thor::Tasks
+module Thor::Sandbox
module Merb
class Collector
attr_reader :dependencies
@@ -20,32 +20,34 @@
end
class Gem < Thor
- def full_list
- @idx.load_gems_in("gems/specifications")
-
- @list.map do |name, versions|
- dep = ::Gem::Dependency.new(name, versions)
- spec = @idx.search(dep).last
- unless spec
- self.class.error "A required dependency #{dep} was not found"
+ no_tasks do
+ def full_list
+ @idx.load_gems_in("gems/specifications")
+
+ @list.map do |name, versions|
+ dep = ::Gem::Dependency.new(name, versions)
+ spec = @idx.search(dep).last
+ unless spec
+ self.class.error "A required dependency #{dep} was not found"
+ self.class.rollback_trans
+ end
+ deps = spec.recursive_dependencies(dep, @idx)
+ [spec] + deps
+ end.flatten.uniq
+ end
+
+ def rescue_failures(error = StandardError, prc = nil)
+ begin
+ yield
+ rescue error => e
+ if prc
+ prc.call(e)
+ else
+ puts e.message
+ puts e.backtrace
+ end
self.class.rollback_trans
end
- deps = spec.recursive_dependencies(dep, @idx)
- [spec] + deps
- end.flatten.uniq
- end
-
- def rescue_failures(error = StandardError, prc = nil)
- begin
- yield
- rescue error => e
- if prc
- prc.call(e)
- else
- puts e.message
- puts e.backtrace
- end
- self.class.rollback_trans
end
end
@@ -90,4 +92,4 @@
end
end
end
-end
\ No newline at end of file
+end
--- NEW FILE rubygem-merb-gen.spec ---
# Generated from merb-gen-1.0.15.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname merb-gen
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global rubyabi 1.8
Summary: Application and plugin generator scripts for Merb
Name: rubygem-%{gemname}
Version: 1.0.15
Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://merbivore.com
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
# Addresses incompatibility with current version of thor - appears to go away
# in next release as thor dependency is gone
Patch0: rubygem-merb-gen-1.0.15-thor-compat.patch
# Fix for tests thanks to Mamoru Tasaka
# Issue appears fixed in upcoming releases
Patch1: rubygem-merb-gen-1.0.15-fix-tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(merb-core)
Requires: rubygem(templater)
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires(check): rubygem(merb-core)
BuildRequires(check): rubygem(templater)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}
%description
Application and plugin generator scripts for Merb.
Installing this package will provide the capability to generate a functional
Merb application.
This package contains the merb-gen binary and library.
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
This package contains documentation for %{name}.
%prep
%setup -q -c -T
mkdir -p .%{gemdir}
gem install -V \
--local \
--install-dir $(pwd)/%{gemdir} \
--force --rdoc \
%{SOURCE0}
pushd .%{geminstdir}
%patch0 -p1
%patch1 -p1
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
find %{buildroot}%{geminstdir}/bin -type f | \
xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'
%clean
rm -rf %{buildroot}
%check
pushd .%{geminstdir}
rake spec
%files
%defattr(-,root,root,-)
%{_bindir}/merb-gen
%doc %{geminstdir}/[A-Z]*
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%files doc
%defattr(-,root,root,-)
%{geminstdir}/Rakefile
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}
%changelog
* Mon Feb 15 2010 Matthew Kent <mkent at magoazul.com> - 1.0.15-2
- Patch from Mamoru Tasaka to permit enabling of %%check phase (#557021).
* Tue Dec 08 2009 Matthew Kent <mkent at magoazul.com> - 1.0.15-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-merb-gen/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Feb 2010 19:12:47 -0000 1.1
+++ .cvsignore 25 Feb 2010 06:50:12 -0000 1.2
@@ -0,0 +1 @@
+merb-gen-1.0.15.gem
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-merb-gen/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Feb 2010 19:12:47 -0000 1.1
+++ sources 25 Feb 2010 06:50:12 -0000 1.2
@@ -0,0 +1 @@
+da7bc997f920b0e13ed7dd08b6a40478 merb-gen-1.0.15.gem
More information about the scm-commits
mailing list