petfinder 0.1.0 → 0.1.1

data/Gemfile

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem 'httparty', '~>0.5.0'
+gem 'happymapper', '~>0.3.2'
+
+group :development do
+  gem 'fakeweb', '~>1.2.5'
+  gem 'rspec', '~>2.0.pre'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Eric Hutzelman
+Copyright (c) Eric Hutzelman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,50 +1,152 @@
 require 'rubygems'
 require 'rake'
+require 'date'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "petfinder"
-    gem.summary = %Q{Ruby gem wrapper for the Petfinder API}
-    gem.description = %Q{Ruby gem wrapper for the Petfinder API}
-    gem.email = "ehutzelman@gmail.com"
-    gem.homepage = "http://github.com/ehutzelman/petfinder"
-    gem.authors = ["Eric Hutzelman"]
-
-    gem.add_dependency('happymapper', '>= 0.3.2')
-    gem.add_dependency('httparty', '>= 0.5.0')
-    
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency 'fakeweb', '>= 1.2.5'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+def date
+  Date.today.to_s
 end
 
-task :spec => :check_dependencies
+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 => :spec
 
+Rspec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+# require 'rake/testtask'
+# Rake::TestTask.new(:test) do |test|
+#   test.libs << 'lib' << 'test'
+#   test.pattern = 'test/**/test_*.rb'
+#   test.verbose = true
+# 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
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "petfinder #{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
+#
+#############################################################################
+
+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
+
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+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
+
+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/petfinder/client.rb

@@ -25,7 +25,8 @@ module Petfinder
     
     # Options available: animal, breed, size, sex, location, shelterid 
     def random_pet(options = {})
-      response = perform_get("/pet.getRandom", :query => {:output => 'full'})
+      query = options.merge(:output => 'full')
+      response = perform_get("/pet.getRandom", :query => query)
       Pet.parse(response, :single => true)
     end
     

data/lib/petfinder.rb

@@ -2,14 +2,21 @@ require 'httparty'
 require 'happymapper'
 require 'digest/md5'
 
+require 'petfinder/client'
+require 'petfinder/pet'
+require 'petfinder/breeds'
+require 'petfinder/shelter'
+require 'petfinder/auth'
+
 module Petfinder
-  
+  VERSION = '0.1.1'
+
   class PetfinderError < StandardError; end
 
   class << self
     attr_accessor :api_key, :api_secret
   end
-  
+
   def self.configure
     yield self
     true
@@ -17,10 +24,3 @@ module Petfinder
 
 end
 
-directory = File.expand_path(File.dirname(__FILE__))
-
-require File.join(directory, 'petfinder', 'client')
-require File.join(directory, 'petfinder', 'pet')
-require File.join(directory, 'petfinder', 'breeds')
-require File.join(directory, 'petfinder', 'shelter')
-require File.join(directory, 'petfinder', 'auth')

data/petfinder.gemspec

@@ -1,75 +1,83 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{petfinder}
-  s.version = "0.1.0"
-
+  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 = ["Eric Hutzelman"]
-  s.date = %q{2010-07-09}
-  s.description = %q{Ruby gem wrapper for the Petfinder API}
-  s.email = %q{ehutzelman@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/petfinder.rb",
-     "lib/petfinder/auth.rb",
-     "lib/petfinder/breeds.rb",
-     "lib/petfinder/client.rb",
-     "lib/petfinder/pet.rb",
-     "lib/petfinder/shelter.rb",
-     "petfinder.gemspec",
-     "spec/fixtures/auth.xml",
-     "spec/fixtures/breed_list.xml",
-     "spec/fixtures/pet.xml",
-     "spec/fixtures/pet_list.xml",
-     "spec/fixtures/shelter.xml",
-     "spec/fixtures/shelter_list.xml",
-     "spec/petfinder_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ehutzelman/petfinder}
+  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              = 'petfinder'
+  s.version           = '0.1.1'
+  s.date              = '2010-09-22'
+  s.rubyforge_project = 'petfinder'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "Ruby gem wrapper for the Petfinder API."
+  #s.description = "Ruby gem wrapper for the Petfinder API."
+
+  ## 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  = ["Eric Hutzelman"]
+  s.email    = 'ehutzelman@gmail.com'
+  s.homepage = 'http://github.com/ehutzelman/petfinder'
+
+  ## 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]
+
+  ## This sections is only necessary if you have C extensions.
+  # s.require_paths << 'ext'
+  # s.extensions = %w[ext/extconf.rb]
+
+  ## If your gem includes any executables, list them here.
+  # s.executables = ["name"]
+  # s.default_executable = 'name'
+
+  ## 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.7}
-  s.summary = %q{Ruby gem wrapper for the Petfinder API}
-  s.test_files = [
-    "spec/petfinder_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.extra_rdoc_files = %w[README.rdoc 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_dependency('happymapper', [">= 0.3.2"])
+  s.add_dependency('httparty', [">= 0.5.0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<happymapper>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.5.0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 1.2.5"])
-    else
-      s.add_dependency(%q<happymapper>, [">= 0.3.2"])
-      s.add_dependency(%q<httparty>, [">= 0.5.0"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
-    end
-  else
-    s.add_dependency(%q<happymapper>, [">= 0.3.2"])
-    s.add_dependency(%q<httparty>, [">= 0.5.0"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
-  end
-end
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  s.add_development_dependency('rspec', [">= 2.0.pre"])
+  s.add_development_dependency('fakeweb', [">= 1.2.5"])
+
+  ## 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
+    LICENSE
+    README.rdoc
+    Rakefile
+    lib/petfinder.rb
+    lib/petfinder/auth.rb
+    lib/petfinder/breeds.rb
+    lib/petfinder/client.rb
+    lib/petfinder/pet.rb
+    lib/petfinder/shelter.rb
+    petfinder.gemspec
+    spec/fixtures/auth.xml
+    spec/fixtures/breed_list.xml
+    spec/fixtures/pet.xml
+    spec/fixtures/pet_list.xml
+    spec/fixtures/shelter.xml
+    spec/fixtures/shelter_list.xml
+    spec/petfinder_spec.rb
+    spec/spec_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 =~ /^spec\/.*_spec\.rb/ }
+end

data/spec/spec_helper.rb

@@ -1,20 +1,17 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'rubygems'
 require 'petfinder'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'fakeweb'
 
-Spec::Runner.configure do |config|  
-end
-
 def fixture_file(filename)
   File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")
 end
 
 def stub_get(url, filename, options={})
   opts = {:body => fixture_file(filename)}.merge(options)
-  
+
   FakeWeb.register_uri(:get, url, opts)
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: petfinder
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Eric Hutzelman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 3
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -58,12 +55,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - pre
+        version: 2.0.pre
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 2
@@ -82,22 +77,20 @@ dependencies:
         version: 1.2.5
   type: :development
   version_requirements: *id004
-description: Ruby gem wrapper for the Petfinder API
+description: 
 email: ehutzelman@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
+- LICENSE
 files: 
-- .document
-- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/petfinder.rb
 - lib/petfinder/auth.rb
 - lib/petfinder/breeds.rb
@@ -112,7 +105,6 @@ files:
 - spec/fixtures/shelter.xml
 - spec/fixtures/shelter_list.xml
 - spec/petfinder_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ehutzelman/petfinder
@@ -128,7 +120,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -137,17 +128,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: petfinder
 rubygems_version: 1.3.7
 signing_key: 
-specification_version: 3
-summary: Ruby gem wrapper for the Petfinder API
+specification_version: 2
+summary: Ruby gem wrapper for the Petfinder API.
 test_files: 
 - spec/petfinder_spec.rb
-- spec/spec_helper.rb

data/.document

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

data/.gitignore

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

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/spec/spec.opts

@@ -1 +0,0 @@
---color