holoserve-connector 0.2.1 → 0.3.0

data/Rakefile

@@ -1,56 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
-begin
-  require 'cucumber'
-  require 'cucumber/rake/task'
-
-  Cucumber::Rake::Task.new(:features) do |task|
-    task.cucumber_opts = "features --format pretty"
-  end
-
-  namespace :features do
-
-    Cucumber::Rake::Task.new(:wip) do |task|
-      task.cucumber_opts = "features --format pretty --tags @wip"
-    end
-
-  end
-rescue LoadError
-end
-
-begin
-  require 'rspec'
-  require 'rspec/core/rake_task'
-
-  desc "Run specs"
-  RSpec::Core::RakeTask.new do |task|
-    task.pattern = "./spec/lib/**/*_spec.rb"
-  end
-rescue LoadError
-end
-
-begin
-  require 'rdoc'
-  require 'rdoc/task'
-
-  Rake::RDocTask.new do |rdoc|
-    rdoc.main = "README.rdoc"
-    rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  end
-rescue LoadError
-end
-
-namespace :gem do
-
-  desc "Builds the gem"
-  task :build do
-    system "gem build *.gemspec && mkdir -p pkg/ && mv *.gem pkg/"
-  end
-
-  desc "Builds and installs the gem"
-  task :install => :build do
-    system "gem install pkg/"
-  end
-
-end
+load File.join(File.dirname(__FILE__), "tasks", "features.rake")
+load File.join(File.dirname(__FILE__), "tasks", "gem.rake")
+load File.join(File.dirname(__FILE__), "tasks", "rdoc.rake")
+load File.join(File.dirname(__FILE__), "tasks", "spec.rake")

data/lib/holoserve/connector/bucket.rb

@@ -1,3 +1,4 @@
+require 'transport'
 
 class Holoserve::Connector::Bucket
 

data/lib/holoserve/connector/history.rb

@@ -1,3 +1,4 @@
+require 'transport'
 
 class Holoserve::Connector::History
 

data/lib/holoserve/connector/pairs.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'transport'
 
 class Holoserve::Connector::Pairs
 
@@ -6,37 +6,19 @@ class Holoserve::Connector::Pairs
     @client = client
   end
 
-  def upload(pattern)
-    Dir[ pattern ].each do |filename|
-      upload_file filename
-    end
+  def ids
+    Transport::JSON.request :get,
+                            "#{@client.url}/pairs",
+                            :expected_status_code => 200
   end
 
   def download(id)
-    response = Transport::HTTP.request :get,
-                                       "#{@client.url}/pairs/#{id}.yaml",
-                                       :expected_status_code => 200
-    YAML.load response
+    Transport::JSON.request :get,
+                            "#{@client.url}/pairs/#{id}",
+                            :expected_status_code => 200
   rescue Transport::UnexpectedStatusCodeError => error
     raise Holoserve::Connector::Error, error.message unless error.status_code == 404
     nil
   end
 
-  def clear!
-    Transport::JSON.request :delete, "#{@client.url}/pairs"
-  end
-
-  private
-
-  def upload_file(filename)
-    uploader = Holoserve::Connector::Tool::Uploader.new filename,
-                                                       :post,
-                                                       "#{@client.url}/pairs",
-                                                       :expected_status_code => 200
-    uploader.upload
-  rescue Transport::UnexpectedStatusCodeError => error
-    raise Holoserve::Connector::Error, "the file #{filename} has an invalid format" if error.status_code == 400
-    raise Holoserve::Connector::Error, error.message
-  end
-
 end

data/lib/holoserve/connector/state.rb

@@ -0,0 +1,21 @@
+require 'transport'
+
+class Holoserve::Connector::State
+
+  def initialize(client)
+    @client = client
+  end
+
+  def set(hash)
+    Transport::JSON.request :put, "#{@client.url}/state", :parameters => hash
+  end
+
+  def get
+    Transport::JSON.request :get, "#{@client.url}/state"
+  end
+
+  def clear!
+    Transport::JSON.request :delete, "#{@client.url}/state"
+  end
+
+end

data/lib/holoserve/connector.rb

@@ -5,7 +5,7 @@ class Holoserve::Connector
   autoload :Fixtures, File.join(File.dirname(__FILE__), "connector", "fixtures")
   autoload :History, File.join(File.dirname(__FILE__), "connector", "history")
   autoload :Pairs, File.join(File.dirname(__FILE__), "connector", "pairs")
-  autoload :Situation, File.join(File.dirname(__FILE__), "connector", "situation")
+  autoload :State, File.join(File.dirname(__FILE__), "connector", "state")
   autoload :Tool, File.join(File.dirname(__FILE__), "connector", "tool")
 
   class Error < StandardError; end
@@ -14,10 +14,9 @@ class Holoserve::Connector
   attr_reader :port
 
   attr_reader :bucket
-  attr_reader :fixtures
   attr_reader :history
   attr_reader :pairs
-  attr_reader :situation
+  attr_reader :state
 
   def initialize(options = { })
     @host, @port = *options.values_at(:host, :port)
@@ -25,10 +24,9 @@ class Holoserve::Connector
     @port ||= 4250
 
     @bucket = Bucket.new self
-    @fixtures = Fixtures.new self
     @history = History.new self
     @pairs = Pairs.new self
-    @situation = Situation.new self
+    @state = State.new self
   end
 
   def url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve-connector
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70269436646480 !ruby/object:Gem::Requirement
+  requirement: &70365766527360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269436646480
+  version_requirements: *70365766527360
 - !ruby/object:Gem::Dependency
   name: holoserve
-  requirement: &70269436645880 !ruby/object:Gem::Requirement
+  requirement: &70365766526560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269436645880
+  version_requirements: *70365766526560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70269436645320 !ruby/object:Gem::Requirement
+  requirement: &70365766525820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269436645320
+  version_requirements: *70365766525820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70269436644820 !ruby/object:Gem::Requirement
+  requirement: &70365766525140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269436644820
+  version_requirements: *70365766525140
 description: Provides a client for the control interface of holoserve and some RSpec
   matchers.
 email: philipp.bruell@skrill.com
@@ -67,10 +67,9 @@ files:
 - LICENSE
 - Rakefile
 - lib/holoserve/connector/bucket.rb
-- lib/holoserve/connector/fixtures.rb
 - lib/holoserve/connector/history.rb
 - lib/holoserve/connector/pairs.rb
-- lib/holoserve/connector/situation.rb
+- lib/holoserve/connector/state.rb
 - lib/holoserve/connector/tool/uploader.rb
 - lib/holoserve/connector/tool.rb
 - lib/holoserve/connector.rb
@@ -92,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -282806050013495417
+      hash: 35958409398174168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: holoserve-connector
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Connector library for HoloServe.

data/lib/holoserve/connector/fixtures.rb

@@ -1,41 +0,0 @@
-
-class Holoserve::Connector::Fixtures
-
-  def initialize(client)
-    @client = client
-  end
-
-  def upload(pattern)
-    Dir[ pattern ].each do |filename|
-      upload_file filename
-    end
-  end
-
-  def download(id)
-    response = Transport::HTTP.request :get,
-                                       "#{@client.url}/fixtures/#{id}.yaml",
-                                       :expected_status_code => 200
-    YAML.load response
-  rescue Transport::UnexpectedStatusCodeError => error
-    raise Holoserve::Connector::Error, error.message unless error.status_code == 404
-    nil
-  end
-
-  def clear!
-    Transport::JSON.request :delete, "#{@client.url}/fixtures"
-  end
-
-  private
-
-  def upload_file(filename)
-    uploader = Holoserve::Connector::Tool::Uploader.new filename,
-                                                       :post,
-                                                       "#{@client.url}/fixtures",
-                                                       :expected_status_code => 200
-    uploader.upload
-  rescue Transport::UnexpectedStatusCodeError => error
-    raise Holoserve::Connector::Error, "the file #{filename} has an invalid format" if error.status_code == 400
-    raise Holoserve::Connector::Error, error.message
-  end
-
-end

data/lib/holoserve/connector/situation.rb

@@ -1,22 +0,0 @@
-
-class Holoserve::Connector::Situation
-
-  def initialize(client)
-    @client = client
-  end
-
-  def name=(value)
-    Transport::JSON.request :put, "#{@client.url}/situation", :parameters => { :name => value }
-  end
-
-  def name
-    response = Transport::JSON.request :get, "#{@client.url}/situation"
-    name = response["name"]
-    name == "" ? nil : name
-  end
-
-  def clear!
-    Transport::JSON.request :put, "#{@client.url}/situation", :parameters => { :name => nil }
-  end
-
-end