RubyGems - hookercookerman-amee - Versions diffs - 0.2.1 → 0.6.0 - Mend

hookercookerman-amee 0.2.1 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

data/.gitignore +6 -0
data/.yardoc +0 -0
data/{LICENSE.txt → LICENSE} +0 -0
data/Rakefile +41 -24
data/VERSION +1 -0
data/amee.gemspec +156 -36
data/features/step_definitions/amee_steps.rb +5 -5
data/features/step_definitions/data_steps.rb +5 -5
data/features/step_definitions/profile_item_steps.rb +5 -5
data/features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/{D47C465B8157?distance=400&representation=true.json → D47C465B8157?distance=400&representation=full.json} +0 -0
data/lib/amee/profile_api/profile_item.rb +2 -2
data/spec/service_spec.rb +5 -5
metadata +116 -81
data/History.txt +0 -4
data/Manifest.txt +0 -82
data/features/development.feature +0 -13
data/features/step_definitions/common_steps.rb +0 -194
data/spec/spec.opts +0 -1

data/.gitignore ADDED

@@ -0,0 +1,6 @@
+pkg
+doc
+.DS_Store
+tmp
+*.log
+.test-result

data/.yardoc ADDED

Binary file

data/{LICENSE.txt → LICENSE} RENAMED

File without changes

data/Rakefile CHANGED

@@ -1,32 +1,49 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/amee'
+require 'rubygems'
+require 'rake'
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('amee', Amee::VERSION) do |p|
-  p.developer('Richard Hooker', 'richard.hooker@dynamic50.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name # TODO this is default value
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "amee"
+    gem.summary = %Q{Its a gem to interact with the amee api}
+    gem.description = %Q{Amee}
+    gem.email = "hookercookerman@gmail.com"
+    gem.homepage = "http://github.com/hookercookerman/amee"
+    gem.authors = ["Richard Hooker"]
+    gem.test_files.include "features/**/*"
+    gem.files.exclude "spec/**/*"
+    gem.files.exclude "features/**/*"
+    gem.add_development_dependency "rspec", ">=1.2.6"
+    gem.add_development_dependency "cucumber", ">=0.3.94"
+    gem.add_development_dependency "fakeweb", ">=1.2.5"
+    gem.add_dependency('httparty', '>=0.4.3')
+    gem.add_dependency('wycats-moneta', '>=0.5.0')
+    gem.add_dependency('crack', '>=0.1.3')
+    gem.add_dependency('validatable', '>=1.6.7')
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
 # TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
-require 'cucumber/rake/task'
+task :default => [:spec, :features]
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+task :spec => :check_dependencies
+require 'cucumber/rake/task'
 namespace :features do
   Cucumber::Rake::Task.new(:all) do |t|
     t.cucumber_opts = "--format pretty"

data/VERSION ADDED

	@@ -0,0 +1 @@
1	+ 0.6.0

data/amee.gemspec CHANGED

@@ -1,54 +1,174 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{amee}
-  s.version = '0.2.1'
-  s.homepage = 'http://github.com/hookercookerman/amee/tree/master'
-  s.description = %q{Its a gem to interact with the amee api}
-  s.summary = %q{Amee}
+  s.version = "0.6.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Hooker"]
-  s.date = %q{2009-04-24}
-  s.email = ["richard.hooker@dynamic50.com"]
-  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc", "Rakefile", "amee.gemspec", "features/config.feature", "features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json", "features/data/data_category.feature", "features/data/data_item.feature", "features/data/data_item_value.feature", "features/data/drill_down.feature", "features/development.feature", "features/profile/create.profile.feature", "features/profile/create.profile_item.feature", "features/profile/delete.profile.feature", "features/profile/delete.profile_item.feature", "features/profile/get.profile.feature", "features/profile/profile_category.feature", "features/profile/profile_item.feature", "features/profile/profiles.feature", "features/profile/update.profile_item.feature", "features/session/reauthenticate.feature", "features/step_definitions/amee_steps.rb", "features/step_definitions/common_steps.rb", "features/step_definitions/config_steps.rb", "features/step_definitions/data_steps.rb", "features/step_definitions/profile_category_steps.rb", "features/step_definitions/profile_item_steps.rb", "features/step_definitions/profile_steps.rb", "features/support/amee/auth/response.json", "features/support/amee/data.json", "features/support/amee/data/transport/car/generic.json", "features/support/amee/data/transport/car/generic/E57D6E2828EB.json", "features/support/amee/data/transport/car/generic/drill.json", "features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json", "features/support/amee/data/transport/car/generic/drill?fuel=diesel.json", "features/support/amee/data/transport/plane/generic.json", "features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json", "features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json", "features/support/amee/data_category.json", "features/support/amee/data_category_with_data_items.json", "features/support/amee/profiles.json", "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json", "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json", "features/support/amee/profiles/180D73DA5229/home.json", "features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json", "features/support/amee/profiles/7C7D68C2A7CD/home.json", "features/support/amee/profiles/E0BCB3704D15.json", "features/support/amee/profiles/E0BCB3704D15/Business.json", "features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json", "features/support/amee/profiles/profile.json", "features/support/env.rb", "init.rb", "lib/amee.rb", "lib/amee/config.rb", "lib/amee/data_api/data_category.rb", "lib/amee/data_api/data_item.rb", "lib/amee/data_api/data_item_value.rb", "lib/amee/data_api/drill_down.rb", "lib/amee/data_api/item_definition.rb", "lib/amee/data_api/item_value_definition.rb", "lib/amee/data_api/value_definition.rb", "lib/amee/logging.rb", "lib/amee/model.rb", "lib/amee/parser.rb", "lib/amee/profile_api/profile.rb", "lib/amee/profile_api/profile_category.rb", "lib/amee/profile_api/profile_item.rb", "lib/amee/service.rb", "lib/amee/session.rb", "lib/amee/utils/string.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "spec/amee_spec.rb", "spec/service_spec.rb", "spec/session_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake", "tasks/yard.rake"]
-  s.has_rdoc = true
-  s.rdoc_options = ['--main', 'README.rdoc']
-  s.rdoc_options << '--inline-source' << '--charset=UTF-8'
+  s.date = %q{2009-08-13}
+  s.description = %q{Amee}
+  s.email = %q{hookercookerman@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     ".yardoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "amee.gemspec",
+     "init.rb",
+     "lib/amee.rb",
+     "lib/amee/config.rb",
+     "lib/amee/data_api/data_category.rb",
+     "lib/amee/data_api/data_item.rb",
+     "lib/amee/data_api/data_item_value.rb",
+     "lib/amee/data_api/drill_down.rb",
+     "lib/amee/data_api/item_definition.rb",
+     "lib/amee/data_api/item_value_definition.rb",
+     "lib/amee/data_api/value_definition.rb",
+     "lib/amee/logging.rb",
+     "lib/amee/model.rb",
+     "lib/amee/parser.rb",
+     "lib/amee/profile_api/profile.rb",
+     "lib/amee/profile_api/profile_category.rb",
+     "lib/amee/profile_api/profile_item.rb",
+     "lib/amee/service.rb",
+     "lib/amee/session.rb",
+     "lib/amee/utils/string.rb",
+     "script/console",
+     "script/destroy",
+     "script/generate",
+     "script/txt2html",
+     "tasks/rspec.rake",
+     "tasks/yard.rake"
+  ]
+  s.homepage = %q{http://github.com/hookercookerman/amee}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{amee}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Its a gem to interact with the amee api}
+  s.test_files = [
+    "spec/amee_spec.rb",
+     "spec/service_spec.rb",
+     "spec/session_spec.rb",
+     "spec/spec_helper.rb",
+     "features/config.feature",
+     "features/data",
+     "features/data/data_category.feature",
+     "features/data/data_item.feature",
+     "features/data/data_item_value.feature",
+     "features/data/drill_down.feature",
+     "features/profile",
+     "features/profile/create.profile.feature",
+     "features/profile/create.profile_item.feature",
+     "features/profile/delete.profile.feature",
+     "features/profile/delete.profile_item.feature",
+     "features/profile/get.profile.feature",
+     "features/profile/profile_category.feature",
+     "features/profile/profile_item.feature",
+     "features/profile/profiles.feature",
+     "features/profile/update.profile_item.feature",
+     "features/session",
+     "features/session/reauthenticate.feature",
+     "features/step_definitions",
+     "features/step_definitions/amee_steps.rb",
+     "features/step_definitions/config_steps.rb",
+     "features/step_definitions/data_steps.rb",
+     "features/step_definitions/profile_category_steps.rb",
+     "features/step_definitions/profile_item_steps.rb",
+     "features/step_definitions/profile_steps.rb",
+     "features/support",
+     "features/support/amee",
+     "features/support/amee/auth",
+     "features/support/amee/auth/response.json",
+     "features/support/amee/data",
+     "features/support/amee/data/transport",
+     "features/support/amee/data/transport/car",
+     "features/support/amee/data/transport/car/generic",
+     "features/support/amee/data/transport/car/generic/drill.json",
+     "features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json",
+     "features/support/amee/data/transport/car/generic/drill?fuel=diesel.json",
+     "features/support/amee/data/transport/car/generic/E57D6E2828EB.json",
+     "features/support/amee/data/transport/car/generic.json",
+     "features/support/amee/data/transport/plane",
+     "features/support/amee/data/transport/plane/generic",
+     "features/support/amee/data/transport/plane/generic/FFC7A05D54AD",
+     "features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json",
+     "features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json",
+     "features/support/amee/data/transport/plane/generic.json",
+     "features/support/amee/data.json",
+     "features/support/amee/data_category.json",
+     "features/support/amee/data_category_with_data_items.json",
+     "features/support/amee/profiles",
+     "features/support/amee/profiles/155DD3C63646",
+     "features/support/amee/profiles/155DD3C63646/transport",
+     "features/support/amee/profiles/155DD3C63646/transport/motorcycle",
+     "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic",
+     "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json",
+     "features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=full.json",
+     "features/support/amee/profiles/180D73DA5229",
+     "features/support/amee/profiles/180D73DA5229/home.json",
+     "features/support/amee/profiles/48B97680BCCF",
+     "features/support/amee/profiles/48B97680BCCF/home",
+     "features/support/amee/profiles/48B97680BCCF/home/energy",
+     "features/support/amee/profiles/48B97680BCCF/home/energy/quantity",
+     "features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json",
+     "features/support/amee/profiles/7C7D68C2A7CD",
+     "features/support/amee/profiles/7C7D68C2A7CD/home.json",
+     "features/support/amee/profiles/BB1BDB4FDD77",
+     "features/support/amee/profiles/BB1BDB4FDD77/home",
+     "features/support/amee/profiles/BB1BDB4FDD77/home/energy",
+     "features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity",
+     "features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json",
+     "features/support/amee/profiles/E0BCB3704D15",
+     "features/support/amee/profiles/E0BCB3704D15/Business.json",
+     "features/support/amee/profiles/E0BCB3704D15.json",
+     "features/support/amee/profiles/F38ECBD56D59",
+     "features/support/amee/profiles/F38ECBD56D59/home",
+     "features/support/amee/profiles/F38ECBD56D59/home/energy",
+     "features/support/amee/profiles/F38ECBD56D59/home/energy/quantity",
+     "features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json",
+     "features/support/amee/profiles/profile.json",
+     "features/support/amee/profiles.json",
+     "features/support/env.rb"
+  ]
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, ["= 0.4.3"])
-      s.add_runtime_dependency(%q<wycats-moneta>, [">= 0"])
-      s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.3.94"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2.5"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_runtime_dependency(%q<wycats-moneta>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<crack>, [">= 0.1.3"])
+      s.add_runtime_dependency(%q<validatable>, [">= 1.6.7"])
     else
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
-      s.add_dependency(%q<httparty>, ["= 0.4.3"])
-      s.add_dependency(%q<wycats-moneta>, [">= 0"])
-      s.add_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
+      s.add_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_dependency(%q<cucumber>, [">= 0.3.94"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
+      s.add_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_dependency(%q<wycats-moneta>, [">= 0.5.0"])
+      s.add_dependency(%q<crack>, [">= 0.1.3"])
+      s.add_dependency(%q<validatable>, [">= 1.6.7"])
     end
   else
-    s.add_dependency(%q<mislav-will_paginate>, [">= 2.2.3"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<httparty>, ["= 0.4.3"])
-    s.add_dependency(%q<wycats-moneta>, [">= 0"])
-    s.add_dependency(%q<newgem>, [">= 1.3.0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.6"])
+    s.add_dependency(%q<cucumber>, [">= 0.3.94"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2.5"])
+    s.add_dependency(%q<httparty>, [">= 0.4.3"])
+    s.add_dependency(%q<wycats-moneta>, [">= 0.5.0"])
+    s.add_dependency(%q<crack>, [">= 0.1.3"])
+    s.add_dependency(%q<validatable>, [">= 1.6.7"])
   end
-end
+end

data/features/step_definitions/amee_steps.rb CHANGED

@@ -9,7 +9,7 @@ end
 # Profiles
 When(/^I ask the session for: profiles$/) do
   FakeWeb.register_uri(:get, "http://stage.amee.com/profiles",
-    :string => "#{File.read(File.join(AMEE_FIXTURE_PATH, "profiles.json"))}"
+    :body => "#{File.read(File.join(AMEE_FIXTURE_PATH, "profiles.json"))}"
    )
   @models["profiles"] = @amee_session.profiles
 end
@@ -17,7 +17,7 @@ end
 # Profile
 When(/^I ask the session for: profile with: \"(\S+)\"/) do |param|
   FakeWeb.register_uri(:get, "http://stage.amee.com/profiles/#{param}",
-    :file => File.join(AMEE_FIXTURE_PATH, "profiles/#{param}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "profiles/#{param}.json")
    )
   @models["profile"] = @amee_session.get_profile(param)
 end
@@ -25,7 +25,7 @@ end
 # Profile Category
 When(/^I ask the session for: get_profile_category with path: \"(\S+)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
   @models["profile_category"] = @amee_session.get_profile_category(path)
 end
@@ -34,7 +34,7 @@ end
 # Profile Category
 When(/^I ask the session for: get_profile_item with path: \"(\S+)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
   @models["profile_item"] = @amee_session.get_profile_item(path)
 end
@@ -57,7 +57,7 @@ end
 Given(/^the session is stale for path: \"(\S+)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
     [{:status => ["401", "NOT COOL"]},
-     {:file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")}
+     {:body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")}
     ])
 end

data/features/step_definitions/data_steps.rb CHANGED

@@ -1,7 +1,7 @@
 # AMEE DATA CATEGORY
 When(/^I ask the session for: get_data_category with path: \"(.*)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
   @models["data_category"] = @amee_session.get_data_category(path)
 end
@@ -33,7 +33,7 @@ end
 # AMEE DATA ITEM YES COULD REFACTOR
 When(/^I ask the session for: get_data_item with path: \"(.*)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
   @models["data_item"] = @amee_session.get_data_item(path)
 end
@@ -71,7 +71,7 @@ end
 # AMEE DATA ITEM YES COULD REFACTOR
 When(/^I ask the session for: get_data_item_value with path: \"(.*)\"$/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
   @models["data_item_value"] = @amee_session.get_data_item_value(path)
 end
@@ -107,13 +107,13 @@ end
 # DRILL DOWNS
 Given(/I drill down with params: \"(.*)\"/) do |params|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{@models["data_category"].full_path}/drill#{params}",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{@models["data_category"].full_path.gsub(/^\//, "")}/drill#{params}.json")
+    :body => File.join(AMEE_FIXTURE_PATH, "#{@models["data_category"].full_path.gsub(/^\//, "")}/drill#{params}.json")
    )
   # what a wicked line hmmmm
   input = params.gsub("?", "").split("&").map{|a| a.split("=")}.flatten
   selection = Hash[*input.flatten]
-  @models["drill_down"] = @models["data_category"].drill(selection)
+  @models["drill_down"] = @models["data_category"].drill(:query => selection)
 end

data/features/step_definitions/profile_item_steps.rb CHANGED

@@ -20,16 +20,16 @@ end
 When(/^I create a profile item with data_item_uid: \"(\S+)\" the path: \"(.*)\"/) do |uid, path|
   FakeWeb.register_uri(:post, "http://stage.amee.com#{path}?kWhPerMonth=10&dataItemUid=66056991EE23&representation=full",
-  :file => File.join(AMEE_FIXTURE_PATH, "/profiles/BB1BDB4FDD77/home/energy/quantity/response.json")
+  :body => File.join(AMEE_FIXTURE_PATH, "/profiles/BB1BDB4FDD77/home/energy/quantity/response.json")
    )
   @models["profile_category"] = @amee_session.create_profile_item(path, uid, :representation => true, :query => {:kWhPerMonth => "10"})
 end
 When(/^I update the profile item with: distance=400$/) do
-  FakeWeb.register_uri(:put, "http://stage.amee.com#{@models["profile_item"].full_path}?distance=400&representation=true",
-    :file => File.join(AMEE_FIXTURE_PATH, "#{@models["profile_item"].full_path.gsub(/^\//, "")}?distance=400&representation=true.json")
+  FakeWeb.register_uri(:put, "http://stage.amee.com#{@models["profile_item"].full_path}?distance=400&representation=full",
+    :body => File.join(AMEE_FIXTURE_PATH, "#{@models["profile_item"].full_path.gsub(/^\//, "")}?distance=400&representation=full.json")
    )
-  @models["profile_item"].update(:distance => 400)
+  @models["profile_item"].update({:distance => 400}, true)
 end
 Then(/^the profile item item_value: with name: \"Distance\" should have value: \"400\"$/) do
@@ -38,7 +38,7 @@ end
 Given(/I profile exists with path \"(\S+)\"/) do |path|
   FakeWeb.register_uri(:get, "http://stage.amee.com#{path}",
-  :file => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
+  :body => File.join(AMEE_FIXTURE_PATH, "#{path.gsub(/^\//, "")}.json")
    )
    @models["profile_item"] = @amee_session.get_profile_item(path)
 end

data/features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/{D47C465B8157?distance=400&representation=true.json → D47C465B8157?distance=400&representation=full.json} RENAMED

File without changes

data/lib/amee/profile_api/profile_item.rb CHANGED

@@ -21,9 +21,9 @@ module Amee
         self.from_hash(hash, session)
       end
-      def update(fields = {})
+      def update(fields = {}, representation = false)
         session.api_call(:put, "profile_item", self.full_path,
-          :query => fields) do |response|
+          :query => fields.merge(:representation => representation ? "full" : "")) do |response|
           populate_from_hash!(response)
           self
         end

data/spec/service_spec.rb CHANGED

@@ -5,7 +5,7 @@ describe "Given FakeRequests Are Setup" do
   before(:each) do
     FakeWeb.register_uri(:get, "http://stage.amee.com/path",
-      {:string => "{}", :status => [200, "OK"]})
+      {:body => "{}", :status => [200, "OK"]})
   end
   describe "Service", "when performing a request" do
@@ -28,25 +28,25 @@ describe "Given FakeRequests Are Setup" do
     it "should raise Amee::Session::PermissionDenied if status code is 403" do
       FakeWeb.register_uri(:get, "http://stage.amee.com/path",
-        {:string => "{}", :status => [403, "Permission denied"]})
+        {:body => "{}", :status => [403, "Permission denied"]})
       lambda{@service.get("raw", "/path")}.should raise_error(Amee::Session::PermissionDenied )
     end
     it "should raise Amee::Session::Expired if status code is 401" do
       FakeWeb.register_uri(:get, "http://stage.amee.com/path",
-        {:string => "{}", :status => [401, "Permission denied"]})
+        {:body => "{}", :status => [401, "Permission denied"]})
       lambda{@service.get("raw", "/path")}.should raise_error(Amee::Session::Expired )
     end
     it "should raise Amee::Session::UnknownError if status code is 609" do
       FakeWeb.register_uri(:get, "http://stage.amee.com/path",
-        {:string => "{}", :status => [609, "Permission denied"]})
+        {:body => "{}", :status => [609, "Permission denied"]})
       lambda{@service.get("raw", "/path")}.should raise_error(Amee::Session::UnknownError )
     end
     it "should raise Amee::NotFound::Expired if status code is 404" do
       FakeWeb.register_uri(:get, "http://stage.amee.com/path",
-        {:string => "{}", :status => [404, "Permission denied"]})
+        {:body => "{}", :status => [404, "Permission denied"]})
       lambda{@service.get("raw", "/path")}.should raise_error(Amee::Session::NotFound )
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Richard Hooker
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: newgem
+  name: rspec
   type: :development
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.2.6
     version:
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: cucumber
   type: :development
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.3.94
     version:
 - !ruby/object:Gem::Dependency
   name: fakeweb
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: "0"
+        version: 1.2.5
     version:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -48,7 +48,7 @@ dependencies:
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
     version:
@@ -60,84 +60,45 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: "0"
+        version: 0.5.0
+    version:
+- !ruby/object:Gem::Dependency
+  name: crack
+  type: :runtime
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
     version:
 - !ruby/object:Gem::Dependency
-  name: mislav-will_paginate
+  name: validatable
   type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 1.6.7
     version:
-description: Its a gem to interact with the amee api
-email:
-- richard.hooker@dynamic50.com
+description: Amee
+email: hookercookerman@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- History.txt
-- LICENSE.txt
-- Manifest.txt
+- LICENSE
 - README.rdoc
 files:
-- History.txt
-- LICENSE.txt
-- Manifest.txt
+- .gitignore
+- .yardoc
+- LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
 - amee.gemspec
-- features/config.feature
-- features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json
-- features/data/data_category.feature
-- features/data/data_item.feature
-- features/data/data_item_value.feature
-- features/data/drill_down.feature
-- features/development.feature
-- features/profile/create.profile.feature
-- features/profile/create.profile_item.feature
-- features/profile/delete.profile.feature
-- features/profile/delete.profile_item.feature
-- features/profile/get.profile.feature
-- features/profile/profile_category.feature
-- features/profile/profile_item.feature
-- features/profile/profiles.feature
-- features/profile/update.profile_item.feature
-- features/session/reauthenticate.feature
-- features/step_definitions/amee_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/config_steps.rb
-- features/step_definitions/data_steps.rb
-- features/step_definitions/profile_category_steps.rb
-- features/step_definitions/profile_item_steps.rb
-- features/step_definitions/profile_steps.rb
-- features/support/amee/auth/response.json
-- features/support/amee/data.json
-- features/support/amee/data/transport/car/generic.json
-- features/support/amee/data/transport/car/generic/E57D6E2828EB.json
-- features/support/amee/data/transport/car/generic/drill.json
-- features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json
-- features/support/amee/data/transport/car/generic/drill?fuel=diesel.json
-- features/support/amee/data/transport/plane/generic.json
-- features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json
-- features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json
-- features/support/amee/data_category.json
-- features/support/amee/data_category_with_data_items.json
-- features/support/amee/profiles.json
-- features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json
-- features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json
-- features/support/amee/profiles/180D73DA5229/home.json
-- features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json
-- features/support/amee/profiles/7C7D68C2A7CD/home.json
-- features/support/amee/profiles/E0BCB3704D15.json
-- features/support/amee/profiles/E0BCB3704D15/Business.json
-- features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json
-- features/support/amee/profiles/profile.json
-- features/support/env.rb
 - init.rb
 - lib/amee.rb
 - lib/amee/config.rb
@@ -161,21 +122,13 @@ files:
 - script/destroy
 - script/generate
 - script/txt2html
-- spec/amee_spec.rb
-- spec/service_spec.rb
-- spec/session_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
 - tasks/rspec.rake
 - tasks/yard.rake
-has_rdoc: true
-homepage: http://github.com/hookercookerman/amee/tree/master
+has_rdoc: false
+homepage: http://github.com/hookercookerman/amee
 licenses:
 post_install_message:
 rdoc_options:
-- --main
-- README.rdoc
-- --inline-source
 - --charset=UTF-8
 require_paths:
 - lib
@@ -193,10 +146,92 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version:
 requirements: []
-rubyforge_project: amee
+rubyforge_project:
 rubygems_version: 1.3.5
 signing_key:
 specification_version: 3
-summary: Amee
-test_files: []
+summary: Its a gem to interact with the amee api
+test_files:
+- spec/amee_spec.rb
+- spec/service_spec.rb
+- spec/session_spec.rb
+- spec/spec_helper.rb
+- features/config.feature
+- features/data
+- features/data/data_category.feature
+- features/data/data_item.feature
+- features/data/data_item_value.feature
+- features/data/drill_down.feature
+- features/profile
+- features/profile/create.profile.feature
+- features/profile/create.profile_item.feature
+- features/profile/delete.profile.feature
+- features/profile/delete.profile_item.feature
+- features/profile/get.profile.feature
+- features/profile/profile_category.feature
+- features/profile/profile_item.feature
+- features/profile/profiles.feature
+- features/profile/update.profile_item.feature
+- features/session
+- features/session/reauthenticate.feature
+- features/step_definitions
+- features/step_definitions/amee_steps.rb
+- features/step_definitions/config_steps.rb
+- features/step_definitions/data_steps.rb
+- features/step_definitions/profile_category_steps.rb
+- features/step_definitions/profile_item_steps.rb
+- features/step_definitions/profile_steps.rb
+- features/support
+- features/support/amee
+- features/support/amee/auth
+- features/support/amee/auth/response.json
+- features/support/amee/data
+- features/support/amee/data/transport
+- features/support/amee/data/transport/car
+- features/support/amee/data/transport/car/generic
+- features/support/amee/data/transport/car/generic/drill.json
+- features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json
+- features/support/amee/data/transport/car/generic/drill?fuel=diesel.json
+- features/support/amee/data/transport/car/generic/E57D6E2828EB.json
+- features/support/amee/data/transport/car/generic.json
+- features/support/amee/data/transport/plane
+- features/support/amee/data/transport/plane/generic
+- features/support/amee/data/transport/plane/generic/FFC7A05D54AD
+- features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json
+- features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json
+- features/support/amee/data/transport/plane/generic.json
+- features/support/amee/data.json
+- features/support/amee/data_category.json
+- features/support/amee/data_category_with_data_items.json
+- features/support/amee/profiles
+- features/support/amee/profiles/155DD3C63646
+- features/support/amee/profiles/155DD3C63646/transport
+- features/support/amee/profiles/155DD3C63646/transport/motorcycle
+- features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic
+- features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json
+- features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=full.json
+- features/support/amee/profiles/180D73DA5229
+- features/support/amee/profiles/180D73DA5229/home.json
+- features/support/amee/profiles/48B97680BCCF
+- features/support/amee/profiles/48B97680BCCF/home
+- features/support/amee/profiles/48B97680BCCF/home/energy
+- features/support/amee/profiles/48B97680BCCF/home/energy/quantity
+- features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json
+- features/support/amee/profiles/7C7D68C2A7CD
+- features/support/amee/profiles/7C7D68C2A7CD/home.json
+- features/support/amee/profiles/BB1BDB4FDD77
+- features/support/amee/profiles/BB1BDB4FDD77/home
+- features/support/amee/profiles/BB1BDB4FDD77/home/energy
+- features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity
+- features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json
+- features/support/amee/profiles/E0BCB3704D15
+- features/support/amee/profiles/E0BCB3704D15/Business.json
+- features/support/amee/profiles/E0BCB3704D15.json
+- features/support/amee/profiles/F38ECBD56D59
+- features/support/amee/profiles/F38ECBD56D59/home
+- features/support/amee/profiles/F38ECBD56D59/home/energy
+- features/support/amee/profiles/F38ECBD56D59/home/energy/quantity
+- features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json
+- features/support/amee/profiles/profile.json
+- features/support/amee/profiles.json
+- features/support/env.rb

data/History.txt DELETED

@@ -1,4 +0,0 @@
-== 0.0.1 2009-04-24
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt DELETED

@@ -1,82 +0,0 @@
-History.txt
-LICENSE.txt
-Manifest.txt
-README.rdoc
-Rakefile
-features/config.feature
-features/data/data_category.feature
-features/data/data_item.feature
-features/data/data_item_value.feature
-features/data/drill_down.feature
-features/development.feature
-features/profile/create.profile.feature
-features/profile/create.profile_item.feature
-features/profile/delete.profile.feature
-features/profile/delete.profile_item.feature
-features/profile/get.profile.feature
-features/profile/profile_category.feature
-features/profile/profile_item.feature
-features/profile/profiles.feature
-features/profile/update.profile_item.feature
-features/session/reauthenticate.feature
-features/step_definitions/amee_steps.rb
-features/step_definitions/common_steps.rb
-features/step_definitions/config_steps.rb
-features/step_definitions/data_steps.rb
-features/step_definitions/profile_category_steps.rb
-features/step_definitions/profile_item_steps.rb
-features/step_definitions/profile_steps.rb
-features/support/amee/auth/response.json
-features/support/amee/data.json
-features/support/amee/data/transport/car/generic.json
-features/support/amee/data/transport/car/generic/E57D6E2828EB.json
-features/support/amee/data/transport/car/generic/drill.json
-features/support/amee/data/transport/car/generic/drill?fuel=diesel&size=large.json
-features/support/amee/data/transport/car/generic/drill?fuel=diesel.json
-features/support/amee/data/transport/plane/generic.json
-features/support/amee/data/transport/plane/generic/FFC7A05D54AD.json
-features/support/amee/data/transport/plane/generic/FFC7A05D54AD/kgCO2PerPassengerJourney.json
-features/support/amee/data_category.json
-features/support/amee/data_category_with_data_items.json
-features/support/amee/profiles.json
-features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157.json
-features/support/amee/profiles/155DD3C63646/transport/motorcycle/generic/D47C465B8157?distance=400&representation=true.json
-features/support/amee/profiles/180D73DA5229/home.json
-features/support/amee/profiles/48B97680BCCF/home/energy/quantity/response.json
-features/support/amee/profiles/7C7D68C2A7CD/home.json
-features/support/amee/profiles/BB1BDB4FDD77/home/energy/quantity/response.json
-features/support/amee/profiles/E0BCB3704D15.json
-features/support/amee/profiles/E0BCB3704D15/Business.json
-features/support/amee/profiles/F38ECBD56D59/home/energy/quantity/5891C88F29FA.json
-features/support/amee/profiles/profile.json
-features/support/env.rb
-init.rb
-lib/amee.rb
-lib/amee/config.rb
-lib/amee/data_api/data_category.rb
-lib/amee/data_api/data_item.rb
-lib/amee/data_api/data_item_value.rb
-lib/amee/data_api/drill_down.rb
-lib/amee/data_api/item_definition.rb
-lib/amee/data_api/item_value_definition.rb
-lib/amee/data_api/value_definition.rb
-lib/amee/logging.rb
-lib/amee/model.rb
-lib/amee/parser.rb
-lib/amee/profile_api/profile.rb
-lib/amee/profile_api/profile_category.rb
-lib/amee/profile_api/profile_item.rb
-lib/amee/service.rb
-lib/amee/session.rb
-lib/amee/utils/string.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
-spec/amee_spec.rb
-spec/service_spec.rb
-spec/session_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/rspec.rake
-tasks/yard.rake

data/features/development.feature DELETED

@@ -1,13 +0,0 @@
-Feature: Development processes of newgem itself (rake tasks)
-  As a Newgem maintainer or contributor
-  I want rake tasks to maintain and release the gem
-  So that I can spend time on the tests and code, and not excessive time on maintenance processes
-  Scenario: Generate RubyGem
-    Given this project is active project folder
-    And 'pkg' folder is deleted
-    When task 'rake gem' is invoked
-    Then folder 'pkg' is created
-    And file with name matching 'pkg/*.gem' is created else you should run "rake manifest" to fix this
-    And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/

data/features/step_definitions/common_steps.rb DELETED

@@ -1,194 +0,0 @@
-def in_project_folder(&block)
-  project_folder = @active_project_folder || @tmp_root
-  FileUtils.chdir(project_folder, &block)
-end
-def in_home_folder(&block)
-  FileUtils.chdir(@home_path, &block)
-end
-Given %r{^a safe folder} do
-  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
-  FileUtils.mkdir_p @tmp_root
-  FileUtils.mkdir_p @home_path = File.expand_path(File.join(@tmp_root, "home"))
-  @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-  Given "env variable $HOME set to '#{@home_path}'"
-end
-Given %r{^this project is active project folder} do
-  Given "a safe folder"
-  @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
-end
-Given %r{^env variable \$([\w_]+) set to '(.*)'} do |env_var, value|
-  ENV[env_var] = value
-end
-def force_local_lib_override(project_name = @project_name)
-  rakefile = File.read(File.join(project_name, 'Rakefile'))
-  File.open(File.join(project_name, 'Rakefile'), "w+") do |f|
-    f << "$:.unshift('#{@lib_path}')\n"
-    f << rakefile
-  end
-end
-def setup_active_project_folder project_name
-  @active_project_folder = File.join(@tmp_root, project_name)
-  @project_name = project_name
-end
-Given %r{'(.*)' folder is deleted} do |folder|
-  in_project_folder do
-    FileUtils.rm_rf folder
-  end
-end
-When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, arguments|
-  @stdout = StringIO.new
-  FileUtils.chdir(@active_project_folder) do
-    if Object.const_defined?("APP_ROOT")
-      APP_ROOT.replace(FileUtils.pwd)
-    else
-      APP_ROOT = FileUtils.pwd
-    end
-    run_generator(generator, arguments.split(' '), SOURCES, :stdout => @stdout)
-  end
-  File.open(File.join(@tmp_root, "generator.out"), "w") do |f|
-    @stdout.rewind
-    f << @stdout.read
-  end
-end
-When %r{run executable '(.*)' with arguments '(.*)'} do |executable, arguments|
-  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  in_project_folder do
-    system "#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
-  end
-end
-When %r{run project executable '(.*)' with arguments '(.*)'} do |executable, arguments|
-  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
-  end
-end
-When %r{run local executable '(.*)' with arguments '(.*)'} do |executable, arguments|
-  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin", executable))
-  in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
-  end
-end
-When %r{^task 'rake (.*)' is invoked$} do |task|
-  @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
-  end
-end
-Then %r{^folder '(.*)' (is|is not) created} do |folder, is|
-  in_project_folder do
-    File.exists?(folder).should(is == 'is' ? be_true : be_false)
-  end
-end
-Then %r{^file '(.*)' (is|is not) created} do |file, is|
-  in_project_folder do
-    File.exists?(file).should(is == 'is' ? be_true : be_false)
-  end
-end
-Then %r{^file with name matching '(.*)' is created} do |pattern|
-  in_project_folder do
-    Dir[pattern].should_not be_empty
-  end
-end
-Then %r{gem file '(.*)' and generated file '(.*)' should be the same} do |gem_file, project_file|
-  File.exists?(gem_file).should be_true
-  File.exists?(project_file).should be_true
-  gem_file_contents = File.read(File.dirname(__FILE__) + "/../../#{gem_file}")
-  project_file_contents = File.read(File.join(@active_project_folder, project_file))
-  project_file_contents.should == gem_file_contents
-end
-Then %r{^output same as contents of '(.*)'$} do |file|
-  expected_output = File.read(File.join(File.dirname(__FILE__) + "/../expected_outputs", file))
-  actual_output = File.read(@stdout)
-  actual_output.should == expected_output
-end
-Then %r{^(does|does not) invoke generator '(.*)'$} do |does_invoke, generator|
-  actual_output = File.read(@stdout)
-  does_invoke == "does" ?
-    actual_output.should(match(/dependency\s+#{generator}/)) :
-    actual_output.should_not(match(/dependency\s+#{generator}/))
-end
-Then %r{help options '(.*)' and '(.*)' are displayed} do |opt1, opt2|
-  actual_output = File.read(@stdout)
-  actual_output.should match(/#{opt1}/)
-  actual_output.should match(/#{opt2}/)
-end
-Then %r{^output (does|does not) match \/(.*)\/} do |does, regex|
-  actual_output = File.read(@stdout)
-  (does == 'does') ?
-    actual_output.should(match(/#{regex}/)) :
-    actual_output.should_not(match(/#{regex}/))
-end
-Then %r{^contents of file '(.*)' (does|does not) match \/(.*)\/} do |file, does, regex|
-  in_project_folder do
-    actual_output = File.read(file)
-    (does == 'does') ?
-      actual_output.should(match(/#{regex}/)) :
-      actual_output.should_not(match(/#{regex}/))
-  end
-end
-Then %r{^all (\d+) tests pass} do |expected_test_count|
-  expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
-  actual_output = File.read(@stdout)
-  actual_output.should match(expected)
-end
-Then %r{^all (\d+) examples pass} do |expected_test_count|
-  expected = %r{^#{expected_test_count} examples?, 0 failures}
-  actual_output = File.read(@stdout)
-  actual_output.should match(expected)
-end
-Then %r{^yaml file '(.*)' contains (\{.*\})} do |file, yaml|
-  in_project_folder do
-    yaml = eval yaml
-    YAML.load(File.read(file)).should == yaml
-  end
-end
-Then %r{^Rakefile can display tasks successfully} do
-  @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "rake -T > #{@stdout} 2> #{@stdout}"
-  end
-  actual_output = File.read(@stdout)
-  actual_output.should match(/^rake\s+\w+\s+#\s.*/)
-end
-Then %r{^task 'rake (.*)' is executed successfully} do |task|
-  @stdout.should_not be_nil
-  actual_output = File.read(@stdout)
-  actual_output.should_not match(/^Don't know how to build task '#{task}'/)
-  actual_output.should_not match(/Error/i)
-end
-Then %r{^gem spec key '(.*)' contains \/(.*)\/} do |key, regex|
-  in_project_folder do
-    gem_file = Dir["pkg/*.gem"].first
-    gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
-    spec_value = gem_spec.send(key.to_sym)
-    spec_value.to_s.should match(/#{regex}/)
-  end
-end

data/spec/spec.opts DELETED

	@@ -1 +0,0 @@
1	- --colour