sappy 0.1.1 → 0.1.2

data/Rakefile

@@ -9,6 +9,9 @@ begin
     gemspec.authors = ["Dylan Egan", "Tim Carey-Smith"]
     gemspec.files = %w(README.markdown Rakefile VERSION) + Dir.glob("{lib,bacon}/**/*")
     gemspec.rubyforge_project = 'abcde'
+    gemspec.add_dependency "rack", "1.0.0"
+    gemspec.add_dependency "rest-client", "1.0.3"
+    gemspec.add_dependency "xml-simple", "1.0.12"
   end
 
   Jeweler::RubyforgeTasks.new
@@ -16,7 +19,10 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-desc "Run bacon"
+desc 'Run bacon'
 task :bacon do
   puts `bacon #{Dir["spec/**/*_bacon.rb"].join(" ")}`
 end
+
+desc 'Default: Runs spec'
+task :default => :bacon

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sappy.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'xmlsimple'
 
 require File.dirname(__FILE__) + '/core_ext'

data/lib/sappy/response.rb

@@ -14,7 +14,7 @@ module Sappy
     end
 
     def parse
-      hash = XmlSimple.xml_in(@xml.to_s)
+      hash = XmlSimple.xml_in(@xml.to_s, 'KeepRoot' => false)
       if hash["stat"] == "fail"
         error = hash["err"]
         message = error.first["msg"]

data/spec/credentials.integrity.rb

@@ -0,0 +1,2 @@
+USERNAME = "sappy@siteuptime.com"
+PASSWORD = "password"

data/spec/helper.rb

@@ -1,28 +1,38 @@
-require 'rubygems'
-require 'bacon'
-require 'fakeweb'
-require 'pp'
+require File.dirname(__FILE__) + '/../tmp/vendor/environment'
+Bundler.require_env(:test)
+require 'cgi'
 
 require File.dirname(__FILE__) + '/../lib/sappy'
+begin
+  require File.dirname(__FILE__) + '/credentials.rb'
+rescue LoadError
+  raise "add a spec/credentials.rb that defines USERNAME and PASSWORD constants"
+end
 
 SPEC_DIR = File.dirname(__FILE__) unless defined? SPEC_DIR
 $:<< SPEC_DIR
- 
-# Don't allow real web requests during specs!
-FakeWeb.allow_net_connect = false
-
-# Setup default URL calls
 
 def cached_page(name)
   SPEC_DIR + "/xml/#{name}.xml"
 end
 
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=password&Email=valid%40email.com", :response => cached_page('valid_account'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=password&Email=invalid%40email.com", :response => cached_page('invalid_account'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.accountinfo", :response => cached_page('accountinfo'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.summarystatistics", :response => cached_page('summarystatistics'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?Name=New+Monitor&AuthKey=b7kks5mh1l300v5segaksm8gh3&Enabled=&HostName=new-sf-monitor.com&Login=&AltEmailAlerts=&Content=&Location=sf&EnablePublicStatistics=&Domain=&method=siteuptime.addmonitor&Timeout=&Password=&UpSubject=&AddToStatusPage=&SendAllDownAlerts=&IP=&SendAlertAfter=&DontSendUpAlert=&SendJabberAlert=&CheckPeriod=60&DownSubject=&SendUrlAlert=&SendSms=&PortNumber=&Service=http", :response => cached_page('addmonitor'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.enablemonitor&MonitorId=84043", :response => cached_page('enablemonitor'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.disablemonitor&MonitorId=84043", :response => cached_page('disablemonitor'))
-FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.removemonitor&MonitorId=84043", :response => cached_page('removemonitor'))
+unless ENV['LIVE_SPECS']
+  # Don't allow real web requests
+  FakeWeb.allow_net_connect = false
+
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=#{PASSWORD}&Email=#{CGI.escape USERNAME}", :response => cached_page('valid_account'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=password&Email=invalid%40email.com", :response => cached_page('invalid_account'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.accountinfo", :response => cached_page('accountinfo'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.summarystatistics", :response => cached_page('summarystatistics'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AddToStatusPage=&AltEmailAlerts=&AuthKey=b7kks5mh1l300v5segaksm8gh3&CheckPeriod=60&Content=&Domain=&DontSendUpAlert=&DownSubject=&EnablePublicStatistics=&Enabled=&HostName=engineyard.com&IP=&Location=sf&Login=&Name=New+Monitor&Password=&PortNumber=&SendAlertAfter=&SendAllDownAlerts=&SendJabberAlert=&SendSms=&SendUrlAlert=&Service=http&Timeout=&UpSubject=&method=siteuptime.addmonitor", :response => cached_page('addmonitor'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.enablemonitor&MonitorId=84043", :response => cached_page('enablemonitor'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.disablemonitor&MonitorId=84043", :response => cached_page('disablemonitor'))
+  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.removemonitor&MonitorId=84043", :response => cached_page('removemonitor'))
+end
+
+at_exit do
+  Sappy::Account.login(USERNAME, PASSWORD).monitors.each do |m|
+    m.destroy
+  end
+end

data/spec/sappy/account_bacon.rb

@@ -12,14 +12,21 @@ module Sappy
 
     describe "with correct credentials" do
       before do
-        @account = Account.login("valid@email.com", "password")
+        @account = Account.login(USERNAME, PASSWORD)
+      end
+      
+      before do
         @account.monitors.each do |m|
           m.destroy
         end
       end
 
       it "should obtain an auth key" do
-        @account.authkey.should == "b7kks5mh1l300v5segaksm8gh3"
+        if ENV['LIVE_SPECS']
+          @account.authkey.should.be.kind_of(String)
+        else
+          @account.authkey.should == "b7kks5mh1l300v5segaksm8gh3"
+        end
       end
 
       describe "with no monitors" do
@@ -36,9 +43,13 @@ module Sappy
         end
 
         it "can create a new monitor" do
-          monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "new-sf-monitor.com", :period => "60"})
+          monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
           monitor.id.should.not.be.nil
-          FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+          if ENV['LIVE_SPECS']
+            @account.available_monitors.should == 2
+          else
+            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+          end
           monitors = @account.monitors
           monitors.size.should == 1
           monitors.first.name.should == "New Monitor"

data/spec/sappy/monitor_bacon.rb

@@ -3,9 +3,12 @@ require File.dirname(__FILE__) + '/../helper'
 module Sappy
   describe Monitor do
     before do
-      @account = Account.login("valid@email.com", "password")
+      @account = Account.login(USERNAME, PASSWORD)
+    end
+    
+    before do
       @account.monitors.each { |m| m.destroy }
-      @monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "new-sf-monitor.com", :period => "60"})
+      @monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
     end
 
     describe "an active monitor" do
@@ -32,10 +35,14 @@ module Sappy
 
     describe "a monitor" do
       it "can be destroyed" do
-        FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+        unless ENV['LIVE_SPECS']
+          FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+        end
         @account.monitors.size.should == 1
         lambda { @monitor.destroy }.should.not.raise
-        FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
+        unless ENV['LIVE_SPECS']
+          FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
+        end
         @account.monitors.size.should == 0
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sappy
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dylan Egan
@@ -10,10 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +10:00
+date: 2009-10-03 00:00:00 +10:00
 default_executable: shell
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.12
+    version: 
 description: A wrapper for the SiteUptime API
 email: 
 - dylanegan@gmail.com
@@ -70,11 +99,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: abcde
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Wrapping that shit!
 test_files: 
+- spec/credentials.integrity.rb
 - spec/helper.rb
 - spec/sappy/account_bacon.rb
 - spec/sappy/monitor_bacon.rb