proxymachine 1.2.3 → 1.2.4

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/History.txt

@@ -1,3 +1,8 @@
+= 1.2.4 / 2011-02-01
+  * Bug fixes
+    * Fix version number in procline
+    * Unrequire rubygems. Some people consider this a bug.
+
 = 1.2.3 / 2010-02-23
   * Bug fixes
     * Never retry after connection is established and data is sent
@@ -38,4 +43,4 @@
 
 = 0.2.7 / 2009-10-12
   * Minor changes
-    * Use a 10k buffer to prevent memory growth due to slow clients
+    * Use a 10k buffer to prevent memory growth due to slow clients

data/Rakefile

@@ -1,57 +1,150 @@
 require 'rubygems'
 require 'rake'
+require 'date'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "proxymachine"
-    gem.summary = %Q{ProxyMachine is a simple content aware (layer 7) TCP routing proxy.}
-    gem.email = "tom@mojombo.com"
-    gem.homepage = "http://github.com/mojombo/proxymachine"
-    gem.authors = ["Tom Preston-Werner"]
-    gem.add_dependency('eventmachine', '>= 0.12.10')
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+desc "Generate RCov test coverage and open in your browser"
+task :coverage do
+  require 'rcov'
+  sh "rm -fr coverage"
+  sh "rcov test/test_*.rb"
+  sh "open coverage/index.html"
 end
 
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "proxymachine #{version}"
+  rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build #{gem_file} into the pkg directory"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Generate #{gemspec_file}"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Validate #{gemspec_file}"
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/lib/proxymachine.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'yaml'
 require 'eventmachine'
 require 'logger'
 require 'socket'
@@ -9,6 +9,8 @@ require 'proxymachine/server_connection'
 LOGGER = Logger.new(STDOUT)
 
 class ProxyMachine
+  VERSION = '1.2.4'
+
   MAX_FAST_SHUTDOWN_SECONDS = 10
 
   def self.update_procline
@@ -110,15 +112,6 @@ class ProxyMachine
       end
     end
   end
-
-  def self.version
-    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
-    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
-  rescue
-    'unknown'
-  end
-
-  VERSION = self.version
 end
 
 module Kernel

data/proxymachine.gemspec

@@ -1,67 +1,82 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
+## This is the rakegem gemspec template. Make sure you read and understand
+## all of the comments. Some sections require modification, and others can
+## be deleted if you don't need them. Once you understand the contents of
+## this file, feel free to delete any comments that begin with two hash marks.
+## You can find comprehensive Gem::Specification documentation, at
+## http://docs.rubygems.org/read/chapter/20
 Gem::Specification.new do |s|
-  s.name = %q{proxymachine}
-  s.version = "1.2.3"
-
+  s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-02-23}
-  s.default_executable = %q{proxymachine}
-  s.email = %q{tom@mojombo.com}
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'proxymachine'
+  s.version           = '1.2.4'
+  s.date              = '2011-02-01'
+  s.rubyforge_project = 'proxymachine'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "ProxyMachine is a simple content aware (layer 7) TCP routing proxy."
+  s.description = "ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine."
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["Tom Preston-Werner"]
+  s.email    = 'tom@mojombo.com'
+  s.homepage = 'http://github.com/mojombo/proxymachine'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## If your gem includes any executables, list them here.
   s.executables = ["proxymachine"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/proxymachine",
-     "examples/git.rb",
-     "examples/long.rb",
-     "examples/transparent.rb",
-     "lib/proxymachine.rb",
-     "lib/proxymachine/client_connection.rb",
-     "lib/proxymachine/server_connection.rb",
-     "proxymachine.gemspec",
-     "test/configs/simple.rb",
-     "test/proxymachine_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/mojombo/proxymachine}
+  s.default_executable = 'proxymachine'
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{ProxyMachine is a simple content aware (layer 7) TCP routing proxy.}
-  s.test_files = [
-    "test/configs/simple.rb",
-     "test/proxymachine_test.rb",
-     "test/test_helper.rb",
-     "examples/git.rb",
-     "examples/long.rb",
-     "examples/transparent.rb"
-  ]
+  s.extra_rdoc_files = %w[README.md LICENSE]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-  end
-end
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+  s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
+  s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
 
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    History.txt
+    LICENSE
+    README.md
+    Rakefile
+    bin/proxymachine
+    examples/git.rb
+    examples/long.rb
+    examples/transparent.rb
+    lib/proxymachine.rb
+    lib/proxymachine/client_connection.rb
+    lib/proxymachine/server_connection.rb
+    proxymachine.gemspec
+    test/configs/simple.rb
+    test/proxymachine_test.rb
+    test/test_helper.rb
+  ]
+  # = MANIFEST =
+
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb$/ }
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxymachine
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,36 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2011-02-01 00:00:00 -08:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-    version: 
-description: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
+  version_requirements: *id004
+description: ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine.
 email: tom@mojombo.com
 executables: 
 - proxymachine
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
+- LICENSE
 files: 
-- .document
-- .gitignore
+- Gemfile
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
-- VERSION.yml
 - bin/proxymachine
 - examples/git.rb
 - examples/long.rb
@@ -60,28 +118,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: proxymachine
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: ProxyMachine is a simple content aware (layer 7) TCP routing proxy.
 test_files: 
-- test/configs/simple.rb
 - test/proxymachine_test.rb
-- test/test_helper.rb
-- examples/git.rb
-- examples/long.rb
-- examples/transparent.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 1
-:minor: 2
-:patch: 3
-:build: