htty 1.3.1 → 1.3.2

data/History.markdown

@@ -1,6 +1,11 @@
 Version history for the _htty_ project
 ======================================
 
+<a name="v1.3.2"></a>v1.3.2, Fri 3/04/2011
+-------------------------------------------
+
+* Fixed configuration issues related to [rubygems-test](http://rubygems.org/gems/rubygems-test) gem support
+
 <a name="v1.3.1"></a>v1.3.1, Fri 2/25/2011
 -------------------------------------------
 

data/Rakefile

@@ -1,18 +1,19 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-yard, rspec = false, false
+begin
+  require 'bundler'
+rescue LoadError
+else
+  Bundler::GemHelper.install_tasks
+end
 
 namespace :build do
   begin
     require 'yard'
   rescue LoadError
-    desc '(Not available -- install YARD)'
+    desc "(Not available -- try 'gem install yard')"
     task :doc do
-      STDERR.puts '*** Install YARD in order to build documentation'
+      STDERR.puts "*** 'gem install yard' in order to build documentation"
     end
   else
-    yard = true
     YARD::Rake::YardocTask.new :doc
   end
 end
@@ -42,20 +43,21 @@ end
 begin
   require 'rspec/core/rake_task'
 rescue LoadError
-  desc '(Not available -- install RSpec)'
+  desc "(Not available -- try 'gem install rspec')"
   task :spec do
-    STDERR.puts '*** Install RSpec in order to run specs'
+    STDERR.puts "*** 'gem install rspec' in order to run specs"
   end
 else
-  rspec = true
-
-  def define_spec_task(name, as_subdirectory=true)
+  def define_spec_task(name, options={})
     RSpec::Core::RakeTask.new name do |t|
       t.rspec_opts = ['--color']
-      # TODO: Change '-d' to '--debug' when that `rspec` bug is fixed
-      t.rspec_opts << '-d'
+      t.skip_bundler = options[:skip_bundler]
+      unless options[:debug] == false
+        # TODO: Change '-d' to '--debug' when that `rspec` bug is fixed
+        t.rspec_opts << '-d'
+      end
 
-      directory = as_subdirectory ? "spec/#{name}" : 'spec'
+      directory = options[:as_subdirectory] ? "spec/#{name}" : 'spec'
       t.pattern = "#{directory}/**/*_spec.rb"
     end
   end
@@ -63,23 +65,18 @@ else
   namespace :spec do |n|
     %w(unit integration system).each do |type_of_spec|
       desc "Run #{type_of_spec} specs"
-      define_spec_task type_of_spec
+      define_spec_task type_of_spec, :as_subdirectory => true
     end
   end
 
   desc 'Run all specs'
-  define_spec_task :spec, false
-end
+  define_spec_task :spec
 
-if yard && !rspec
-  desc 'Generate YARD documentation'
-  task '' => :doc
-  task :default => :doc
-else
   desc 'Run all specs'
   task '' => :spec
   task :default => :spec
-end
 
-# Support the 'gem test' command.
-task :test => :spec
+  # Support the 'gem test' command.
+  desc ''
+  define_spec_task :test, :debug => false, :skip_bundler => true
+end

data/htty.gemspec

@@ -19,10 +19,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'mime-types', '~> 1.0'
 
-  s.add_development_dependency 'bluecloth', '~> 2.0'
-  s.add_development_dependency 'rake',      '~> 0.8'
-  s.add_development_dependency 'rspec',     '~> 2.0'
-  s.add_development_dependency 'yard',      '~> 0.2'
+  s.add_development_dependency 'rake',  '~> 0.8'
+  s.add_development_dependency 'rspec', '~> 2.0'
 
   s.rubyforge_project = 'htty'
   s.has_rdoc          = true

data/lib/htty/cli/body_open_command.rb

@@ -1,4 +1,9 @@
-require 'mime/types'
+begin
+  require 'mime/types'
+rescue LoadError
+  require 'rubygems'
+  retry
+end
 require File.expand_path("#{File.dirname __FILE__}/../platform")
 require File.expand_path("#{File.dirname __FILE__}/../tempfile_preserving_extname")
 require File.expand_path("#{File.dirname __FILE__}/display")

data/lib/htty/version.rb

@@ -1,6 +1,6 @@
 module HTTY
 
   # The version of this release of _htty_.
-  VERSION = '1.3.1' unless const_defined?(:VERSION)
+  VERSION = '1.3.2' unless const_defined?(:VERSION)
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: htty
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -06:00
+date: 2011-03-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,68 +26,43 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 8
         version: "0.8"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
-  type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 description: htty is a console application for interacting with web servers. It's a fun way to explore web APIs and to learn the ins and outs of HTTP.
 email: 
 - htty@nilsjonsson.com
@@ -296,6 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
@@ -306,13 +283,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: htty
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: The HTTP TTY