spqr 0.3.3 → 0.3.5

data/Rakefile

@@ -28,11 +28,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
@@ -40,7 +40,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
@@ -56,6 +56,25 @@ task :rpmspec => :build do
   sh "gem2rpm -t spqr.spec.in -o spqr.spec pkg/spqr-#{pkg_version}.gem"
 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
   FileUtils.cp pkg_spec(), 'SPECS'
@@ -68,13 +87,8 @@ task :gen_spec do
 end
 
 desc "Create a tarball"
-task :tarball => [:make_rpmdirs, :gen_spec] do
-  FileUtils.cp_r 'bin', pkg_dir()
-  FileUtils.cp_r 'lib', pkg_dir()
-  FileUtils.cp_r 'examples', 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 => [:pristine, :make_rpmdirs, :gen_spec] do
+  FileUtils.cp pristine_name, 'SOURCES'
 end
 
 desc "Make dirs for building RPM"

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/lib/spqr/app.rb

@@ -18,7 +18,7 @@ require 'logger'
 
 module SPQR
   class App < Qmf::AgentHandler
-    VALID_MECHANISMS = %w{ANONYMOUS PLAIN GSSAPI}
+    VALID_MECHANISMS = %w{ANONYMOUS PLAIN GSSAPI DIGEST-MD5 CRAM-MD5 OTP}
 
     class ClassMeta < Struct.new(:object_class, :schema_class) ; end
 
@@ -56,8 +56,8 @@ module SPQR
       @qmf_port = options[:port]
       @qmf_sendUserId = options.has_key?(:send_user_id) ? options[:send_user_id] : (options.has_key?(:user) || options.has_key?(:password))
 
-      @qmf_explicit_auth = options[:mechanism] && options[:mechanism].upcase
-      raise "Invalid authentication mechanism #{@qmf_explicit_auth}" unless (!@qmf_explicit_auth || VALID_MECHANISMS.include?(@qmf_explicit_auth))
+      @qmf_explicit_mechanism = options[:mechanism] && options[:mechanism].upcase
+      raise "Invalid authentication mechanism #{@qmf_explicit_mechanism}" unless (!@qmf_explicit_mechanism || VALID_MECHANISMS.include?(@qmf_explicit_mechanism))
 
       @qmf_user = options[:user]
       @qmf_password = options[:password]
@@ -198,7 +198,7 @@ module SPQR
       settings.password = @qmf_password if @qmf_sendUserId
 
       implicit_mechanism = @qmf_sendUserId ? "PLAIN" : "ANONYMOUS"
-      settings.mechanism = @explicit_mechanism || implicit_mechanism
+      settings.mechanism = @qmf_explicit_mechanism || implicit_mechanism
       
       @connection = Qmf::Connection.new(settings)
       @log.debug(" +-- @connection created:  #{@connection}")

data/lib/spqr/constants.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # Constants for SQPR
 #
 # Copyright (c) 2009--2010 Red Hat, Inc.

data/ruby-spqr.spec.in

@@ -1,14 +1,19 @@
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%define rel 1
+
+%if (0%{?fedora} == 0 && 0%{?rhel} <= 5)
+%global building_for_el5 1
+%else
+%global building_for_el5 0
+%endif
 
 Summary: SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in Ruby
 Name: ruby-spqr
 Version: SPQR_VERSION
-Release: %{rel}%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: ASL 2.0
 URL: http://git.fedorahosted.org/git/grid/spqr.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(abi) = 1.8
 Requires: ruby
@@ -27,7 +32,8 @@ Requires: ruby(abi) = 1.8
 Requires: ruby
 
 %description -n spqr-gen
-A tool that will generate an spqr application from an xml schema file
+spqr-gen is a tool that will generate an SPQR application from an XML 
+QMF schema file.
 
 %prep
 %setup -q
@@ -35,41 +41,55 @@ A tool that will generate an spqr application from an xml schema file
 %build
 
 %install
+%if %{building_for_el5}
 rm -rf %{buildroot}
+%endif
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/app.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/codegen.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/constants.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/event.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/manageable.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/spqr.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f lib/spqr/utils.rb %{buildroot}/%{ruby_sitelib}/spqr
-cp -f bin/spqr-gen.rb %{buildroot}/%{_bindir}
-
+cp -p -f lib/spqr/app.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/codegen.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/constants.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/event.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/manageable.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/spqr.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f lib/spqr/utils.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -p -f bin/spqr-gen.rb %{buildroot}/%{_bindir}
+
+%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
 %doc examples
-%{ruby_sitelib}/spqr/app.rb
-%{ruby_sitelib}/spqr/codegen.rb
-%{ruby_sitelib}/spqr/constants.rb
-%{ruby_sitelib}/spqr/event.rb
-%{ruby_sitelib}/spqr/manageable.rb
-%{ruby_sitelib}/spqr/spqr.rb
-%{ruby_sitelib}/spqr/utils.rb
+%{ruby_sitelib}/spqr/
 
 %files -n spqr-gen
+%if %{building_for_el5}
 %defattr(-, root, root, -)
+%endif
 %doc LICENSE
 %defattr(755, root, root, -)
 %{_bindir}/spqr-gen.rb
 
 %changelog
 
+* Tue Oct 11 2011 <willb@redhat> - 0.3.4-1
+- build workflow improvements
+
+* Wed Sep 21 2011 <willb@redhat> - 0.3.3-4
+- Specfile improvements
+
+* Fri Sep 16 2011 <willb@redhat> - 0.3.3-3
+- Minor packaging tweaks
+
+* Mon Jun 6 2011 <willb@redhat> - 0.3.3-2
+- Installation now preserves file mode, owner, and modification time
+
 * Fri Feb 4 2011  <willb@redhat> - 0.3.3-1
 - support for alternate authentication mechanisms (BZ 675323)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spqr
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - William Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -06:00
+date: 2011-11-23 00:00:00 -06:00
 default_executable: spqr-gen.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
-- .gitignore
 - CHANGES
 - LICENSE
 - README.rdoc
@@ -87,8 +86,8 @@ homepage: http://git.fedorahosted.org/git/grid/spqr.git
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,20 +116,20 @@ signing_key:
 specification_version: 3
 summary: "SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in Ruby"
 test_files: 
-- spec/spqr_spec.rb
+- examples/hello.rb
+- examples/logdaemon.rb
+- examples/logservice.rb
 - spec/spec_helper.rb
+- spec/spqr_spec.rb
 - test/example-apps.rb
-- test/test_spqr_dummyprop.rb
-- test/test_spqr_listarg.rb
 - test/generic-agent.rb
-- test/test_events.rb
 - test/helper.rb
+- test/test_events.rb
 - test/test_failbot.rb
 - test/test_spqr_boolprop.rb
 - test/test_spqr_clicker.rb
+- test/test_spqr_dummyprop.rb
+- test/test_spqr_hello.rb
 - test/test_spqr_integerprop.rb
+- test/test_spqr_listarg.rb
 - test/test_user_and_context.rb
-- test/test_spqr_hello.rb
-- examples/logdaemon.rb
-- examples/hello.rb
-- examples/logservice.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC