p4ruby 1.0.10 → 1.0.11

data/CHANGES

@@ -1,24 +1,13 @@
 
 = p4ruby
 
-== version 1.0.10
-
-**** NOTE ****
-
-This is a temporary fork of the p4ruby gem which works around an
-ongoing problem of missing files on the Perforce server.
+== version 1.0.11
 
-This fork is hard-coded to download version r10.2 only.
+* remove previous workaround; now uses list of hosed versions to avoid
 
-In the past Perforce has ignored such problems with their ftp server.
-Since these issues are ongoing and beyond my control, I have
-transferred ownership of the gem to Perforce, who may or may not
-resolve the matter. Please send bug reports to them.
-
-Sincerely,
-James M. Lawrence
+== version 1.0.10
 
-**** NOTE ****
+* perforce ftp site has hosed 11.1 directory -- workaround hardcoded for 10.2
 
 == version 1.0.9
 

data/README

@@ -1,23 +1,4 @@
 
-**** NOTE ****
-
-This is a temporary fork of the p4ruby gem which works around an
-ongoing problem of missing files on the Perforce server.
-
-This fork is hard-coded to download version r10.2 only.
-
-In the past Perforce has ignored such problems with their ftp server.
-Since these issues are ongoing and beyond my control, I have
-transferred ownership of the gem to Perforce, who may or may not
-resolve the matter. Please send bug reports to them.
-
-Sincerely,
-James M. Lawrence
-
-**** NOTE ****
-
-=============================================================
-
 = P4Ruby -- Ruby interface to the Perforce API
 
 This is only an installer for the P4Ruby package by Perforce Software.

data/Rakefile

@@ -1,11 +1,109 @@
 
-INSTALLER = './install.rb'
-
-#
-# default task compiles for the gem
-#
-task :default do
-  ARGV.clear
-  ARGV.push "--gem"
-  load INSTALLER
+begin
+  require 'rubygems'
+  gem 'rdoc'
+rescue LoadError
+end
+
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
+
+include FileUtils
+
+README = "README"
+GEMSPEC = eval(File.read("p4ruby.gemspec"))
+RAKEFILE = "Rakefile"
+RAKEFILE_ORIG = "Rakefile.orig"
+
+default_task_definition = %{
+  INSTALLER = './install.rb'
+
+  #
+  # default task compiles for the gem
+  #
+  task :default do
+    ARGV.clear
+    ARGV.push "--gem"
+    load INSTALLER
+  end
+}
+
+eval(default_task_definition)
+
+task :clean => :clobber do
+  rm_rf ["work", "lib", "ext"]
+end
+
+task :update_docs do
+  ruby_path = File.join(
+    Config::CONFIG["bindir"],
+    Config::CONFIG["RUBY_INSTALL_NAME"])
+
+  help = "--help"
+  command = "ruby #{File.basename(INSTALLER)} #{help}"
+  output = `#{ruby_path} #{INSTALLER} #{help}`
+
+  # insert help output into README
+  replace_file(README) { |contents|
+    contents.sub(%r!#{command}.*?==!m) {
+      command + "\n\n  " +
+      output + "\n=="
+    }
+  }
+end
+
+task :doc => :update_docs
+task :doc => :rdoc
+
+task :package => [:clean, :doc]
+task :gem => :clean
+
+RDoc::Task.new { |t|
+  t.main = README
+  t.rdoc_files.include([README])
+  t.rdoc_dir = "html"
+  t.title = "P4Ruby: #{GEMSPEC.summary}"
+}
+
+Gem::PackageTask.new(GEMSPEC) { |t| 
+  t.need_tar = true 
+} 
+
+task :publish => :doc do
+  Rake::RubyForgePublisher.new('p4ruby', 'quix').upload
+end
+
+task :release do
+  mv(RAKEFILE, RAKEFILE_ORIG)
+  begin
+    File.open(RAKEFILE, "w") { |out|
+      out.puts default_task_definition.gsub(%r!^  !m, "")
+    }
+    Rake::Task[:package].invoke
+  ensure
+    mv(RAKEFILE_ORIG, RAKEFILE)
+  end
+end
+
+##################################################
+# util
+
+unless respond_to? :tap
+  module Kernel
+    def tap
+      yield self
+      self
+    end
+  end
+end
+
+def replace_file(file)
+  old_contents = File.read(file)
+  yield(old_contents).tap { |new_contents|
+    File.open(file, "w") { |output|
+      output.print(new_contents)
+    }
+  }
 end

data/install.rb

@@ -9,10 +9,6 @@ require 'fileutils'
 require 'optparse'
 require 'pathname'
 
-def main
-  Installer.new.run
-end
-
 class Installer
   include FileUtils
 
@@ -35,6 +31,9 @@ class Installer
   SERVER = "ftp.perforce.com"
   SERVER_TOP_DIR = Pathname.new "perforce"
 
+  # Mysterious "ghost" releases which lack files
+  HOSED_VERSIONS = %w[09.3 11.1]
+
   P4API_REMOTE_BASENAME = Pathname.new "p4api.tgz"
   P4RUBY_REMOTE_BASENAME = Pathname.new "p4ruby.tgz"
 
@@ -141,12 +140,7 @@ class Installer
     end
 
     @s.attribute(:version_dir) {
-      #
-      # **** NOTE ****
-      #
-      # TODO: remove this workaround for missing files on the server
-      #
-      SERVER_TOP_DIR + "r10.2" # "r#{@s.version}"
+      SERVER_TOP_DIR + "r#{@s.version}"
     }
 
     @s.p4api.attribute(:remote) {
@@ -299,6 +293,8 @@ class Installer
   def versions
     remote_files_matching(SERVER_TOP_DIR, %r!r([0-8]\d\.\d)!) { |match|
       match.captures.first
+    }.reject { |version|
+      HOSED_VERSIONS.include? version
     }.sort
   end
 
@@ -480,4 +476,4 @@ module Kernel
   end
 end
 
-main
+Installer.new.run

data/p4ruby.gemspec

@@ -1,10 +1,11 @@
 
 Gem::Specification.new { |t| 
   t.name = "p4ruby"
-  t.version = "1.0.10"
+  t.version = "1.0.11"
   t.summary = "Ruby interface to the Perforce API"
-  t.author = "Perforce Software"
-  t.email = "support@perforce.com"
+  t.description = t.summary + "."
+  t.author = "Perforce Software (ruby gem by James M. Lawrence)"
+  t.email = "quixoticsycophant@gmail.com"
   t.homepage = "http://p4ruby.rubyforge.org"
   t.rubyforge_project = "p4ruby"
   t.extensions << "Rakefile"
@@ -19,7 +20,6 @@ Gem::Specification.new { |t|
     p4ruby.gemspec
   ]
 
-  t.has_rdoc = true
   t.extra_rdoc_files = ["README"]
   rdoc_exclude = t.files - t.extra_rdoc_files
   t.rdoc_options +=

metadata

@@ -1,16 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: p4ruby
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.10
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
-- Perforce Software
+- Perforce Software (ruby gem by James M. Lawrence)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -04:00
+date: 2011-08-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,11 +25,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: 
-email: support@perforce.com
+description: Ruby interface to the Perforce API.
+email: quixoticsycophant@gmail.com
 executables: []
 
 extensions: 
@@ -64,17 +70,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: p4ruby
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the Perforce API