strongspace 0.1.1 → 0.2.0

data/bin/as_installed/ss

@@ -0,0 +1,19 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'strongspace' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem 'strongspace', version
+load 'strongspace'

data/bin/as_installed/strongspace

@@ -0,0 +1,20 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'strongspace' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem 'strongspace', version
+load 'strongspace'
+

data/lib/strongspace.rb

@@ -1,3 +1,24 @@
 module Strongspace; end
 
-require 'strongspace/client'
+require 'rest_client'
+require 'uri'
+require 'json/pure' unless {}.respond_to?(:to_json)
+require 'fileutils'
+
+STRONGSPACE_LIB_PATH = File.dirname(__FILE__) + "/strongspace/"
+
+[
+ "version",
+ "exceptions",
+ "client",
+ "helpers",
+ "plugin_interface",
+ "plugin",
+ "command",
+ "commands/base"
+].each do |library|
+  require STRONGSPACE_LIB_PATH + library
+end
+
+
+Dir["#{STRONGSPACE_LIB_PATH}/commands/*.rb"].each { |c| require c }

data/lib/strongspace/client.rb

@@ -1,8 +1,3 @@
-require 'rest_client'
-require 'uri'
-require 'strongspace/version'
-require 'json/pure' unless {}.respond_to?(:to_json)
-
 # A Ruby class to call the Strongspace REST API.  You might use this if you want to
 # manage your Strongspace apps from within a Ruby program, such as Capistrano.
 #
@@ -23,14 +18,26 @@ class Strongspace::Client
   attr_accessor :host, :user, :password
 
   def self.auth(user, password, host='https://www.strongspace.com')
-    client = new(user, password, host)
-    JSON.parse client.get('/api/v1/api_token', :username => user, :password => password).to_s
+    begin
+      client = new(user, password, host)
+      return JSON.parse client.get('/api/v1/api_token', :username => user, :password => password).to_s
+    rescue RestClient::Request::Unauthorized => e
+      raise Strongspace::Exceptions::InvalidCredentials
+    rescue SocketError => e
+      raise Strongspace::Exceptions::NoConnection
+    end
   end
 
   def username
+    return nil if !user
+
     self.user.split("/")[0]
   end
 
+  def login_token
+    doc = JSON.parse get('/api/v1/login_token')
+  end
+
   def initialize(user, password, host='https://www.strongspace.com')
     @user = user
     @password = password
@@ -73,6 +80,7 @@ class Strongspace::Client
 
   def snapshots(space_name)
     doc = JSON.parse get("/api/v1/spaces/#{escape(space_name)}/snapshots").to_s
+    doc["snapshots"]
   end
 
   def delete_snapshot(space_name, snapshot_name)
@@ -87,6 +95,7 @@ class Strongspace::Client
   # Get the list of ssh public keys for the current user.
   def keys
     doc = JSON.parse get('/api/v1/ssh_keys')
+    doc["ssh_keys"]
   end
 
   # Add an ssh public key to the current user.

data/lib/strongspace/command.rb

@@ -1,9 +1,3 @@
-require 'strongspace/helpers'
-require 'strongspace/plugin'
-require 'strongspace/commands/base'
-
-Dir["#{File.dirname(__FILE__)}/commands/*.rb"].each { |c| require c }
-
 module Strongspace
   module Command
     class InvalidCommand < RuntimeError; end
@@ -21,7 +15,7 @@ module Strongspace
             raise InvalidCommand
           end
 
-          run_internal 'auth:reauthorize', args.dup if retries > 0
+          run_internal 'auth:reauthorize_interactve', args.dup if retries > 0
           run_internal(command, args.dup)
         rescue InvalidCommand
           error "Unknown command. Run 'strongspace help' for usage information."
@@ -30,7 +24,7 @@ module Strongspace
             STDERR.puts "Authentication failure"
             run(command, args, retries+1)
           else
-            error "Authentication failure"
+            error "! Authentication failure"
           end
         rescue RestClient::ResourceNotFound => e
           error extract_not_found(e.http_body)
@@ -46,6 +40,9 @@ module Strongspace
       end
 
       def run_internal(command, args, strongspace=nil)
+        if command == "web:start"
+          require 'strongspace-web'
+        end
         klass, method = parse(command)
         runner = klass.new(args, strongspace)
         raise InvalidCommand unless runner.respond_to?(method)
@@ -90,3 +87,4 @@ module Strongspace
     end
   end
 end
+

data/lib/strongspace/commands/auth.rb

@@ -20,11 +20,34 @@ module Strongspace::Command
       ENV['STRONGSPACE_HOST'] || 'https://www.strongspace.com'
     end
 
-    def reauthorize
+    def reauthorize_interactve
       @credentials = ask_for_credentials
       write_credentials
     end
 
+    def authorize!
+      @credentials = [args.first, args[1]]
+      r = Strongspace::Client.auth(@credentials[0], @credentials[1])
+      if r
+        @credentials[0] = "#{@credentials[0]}/token"
+        @credentials[1] = r['api_token']
+        write_credentials
+        return true
+      end
+
+      return false
+    end
+
+    def authenticated_login
+      if args.blank?
+        url = "#{host}/login/#{client.login_token['login_token']}"
+      else
+        to = URI.escape(args[0][0..1]) + URI.escape(URI.escape(args[0][2..-1])).gsub('&', '%26')
+        url = "#{host}/login/#{client.login_token['login_token']}?to=#{to}"
+      end
+      `open "#{url}"`
+    end
+
     def user    # :nodoc:
       get_credentials
       @credentials[0]
@@ -36,7 +59,7 @@ module Strongspace::Command
     end
 
     def credentials_file
-      "#{home_directory}/.strongspace/credentials"
+      "#{credentials_folder}/credentials"
     end
 
     def get_credentials    # :nodoc:
@@ -72,6 +95,15 @@ module Strongspace::Command
       ["#{user}/token", Strongspace::Client.auth(user, password, host)['api_token']]
     end
 
+    def valid_saved_credentials?
+      if File.exists?(credentials_file)
+        credentials = read_credentials
+        r = Strongspace::Client.auth(credentials[0], credentials[1])
+        return !r.blank?
+      end
+      return false
+    end
+
     def ask_for_password_on_windows
       require "Win32API"
       char = nil
@@ -124,7 +156,12 @@ module Strongspace::Command
     end
 
     def write_credentials
-      FileUtils.mkdir_p(File.dirname(credentials_file))
+      begin
+        FileUtils.mkdir_p(credentials_folder)
+      rescue Errno::EEXIST => e
+
+      end
+
       File.open(credentials_file, 'w') do |f|
         f.puts self.credentials
       end

data/lib/strongspace/commands/base.rb

@@ -1,7 +1,3 @@
-require 'fileutils'
-require 'strongspace/plugin_interface'
-
-
 module Strongspace::Command
   class Base
     include Strongspace::Helpers

data/lib/strongspace/commands/help.rb

@@ -58,8 +58,8 @@ module Strongspace::Command
         group.command 'spaces:create <name> [type]',        'add a new space. type => (normal,public,backup)'
         group.command 'spaces:delete <name> [type]',       'remove a space by and destroy its data'
         group.command 'spaces:snapshots <name>',                        'show a space\'s snapshots'
-        group.command 'spaces:create_snapshot <name@snapshot_name>',            'take a space of a space.'
-        group.command 'spaces:delete_snapshot <name@snapshot_name>',         'remove a snapshot from a space'
+        group.command 'spaces:create_snapshot <name> [snapshot_name]',        'take a space of a space - snapshot_name defaults to current date/time.'
+        group.command 'spaces:delete_snapshot <name> <snapshot_name>',         'remove a snapshot from a space'
       end
 
       group 'Plugins' do |group|

data/lib/strongspace/commands/keys.rb

@@ -2,7 +2,7 @@ module Strongspace::Command
   class Keys < Base
     def list
       long = args.any? { |a| a == '--long' }
-      keys = strongspace.keys["ssh_keys"]
+      keys = strongspace.keys
       if keys.empty?
         display "No keys for #{strongspace.username}"
       else
@@ -11,6 +11,7 @@ module Strongspace::Command
           display long ? key["key"].strip : format_key_for_display(key["key"]) + "    key-id: #{key["id"]}"
         end
       end
+      keys
     end
     alias :index :list
 
@@ -19,6 +20,25 @@ module Strongspace::Command
       return ($? == 0)
     end
 
+    def generate_for_gui
+      return unless running_on_a_mac?
+      FileUtils.mkdir "#{credentials_folder}" unless File.exist? "#{credentials_folder}"
+
+
+      File.open("#{credentials_folder}/known_hosts", "w") do |f|
+        f.write "*.strongspace.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArXBYAoHZWVzLfHNMlgteAbq20AaCVcE1qALqVjYZerIpa3rBjNlv2i/2O8ul3OmSfcQwQGPTnABLqz9cozAbxF01eDfqUiSABUDT6m1/lY1a0V7RGS46Y/KJMVbOb4mVpxDZOVwBQh/DYTu7R55vFc93lXpE+tZboqnuq+LvJIZDqzoGTHIUprRs3sNY8Xegnz+m68P+tV6iLkXMRk8Gh8/IIavN4mXYhWPVbCv6Gqo2XhiYVMrCqLZFKLG0W6uwWY/xOhUjWxKDZMlqhyU/YUsMB5BZc9/x0t+Sc82OL+Eh3IB5EUmmCWnhm/LKxjMIn2UNe48BQqwaU/gozVtVPQ==\n"
+      end
+
+
+      if !File.exist? "#{credentials_folder}/#{hostname}.rsa"
+        `/usr/bin/ssh-keygen -f #{credentials_folder}/#{hostname}.rsa -b 2048 -C \" Strongspace App - #{hostname}\" -q -N ""` unless File.exist? "#{credentials_folder}/#{hostname}.rsa"
+        args[0] = "#{credentials_folder}/#{hostname}.rsa.pub"
+        begin
+          add
+        rescue RestClient::Conflict => e # Swallow errors if the key already exists on Strongspace
+        end
+      end
+    end
 
     def add
       keyfile = args.first || find_key
@@ -39,6 +59,19 @@ module Strongspace::Command
       display "All keys removed."
     end
 
+    def valid_key_gui?
+      return unless running_on_a_mac? and File.exist? "#{support_directory}/ssh"
+
+      ret = `ssh -o PreferredAuthentications=publickey -i "#{support_directory}/ssh/#{hostname}.rsa" #{strongspace.username}@#{strongspace.username}.strongspace.com 2>&1`
+
+      if ret.include? "Strongspace"
+        display "Valid key installed"
+        return true
+      end
+      display "No valid key installed"
+      return false
+    end
+
     protected
       def find_key
         %w(rsa dsa).each do |key_type|

data/lib/strongspace/commands/spaces.rb

@@ -2,14 +2,13 @@ module Strongspace::Command
   class Spaces < Base
     def list
       long = args.any? { |a| a == '--long' }
-      spaces = strongspace.spaces["spaces"]
+      spaces = strongspace.spaces
 
       if spaces.empty?
         display "#{strongspace.username} has no spaces"
       else
         display "=== #{strongspace.username} has #{spaces.size} space#{'s' if spaces.size > 1}"
         spaces.each do |space|
-          space = space["space"]
           display "#{space['name']} [type: #{space['type']}, snapshots: #{space['snapshots']}]"
         end
       end
@@ -34,31 +33,171 @@ module Strongspace::Command
         display "No space specified."
         return
       end
-      snapshots = strongspace.snapshots(args.first)["snapshots"]
+      snapshots = strongspace.snapshots(args.first)
 
       if snapshots.empty?
         display "Space #{args.first} has no snapshots"
       else
         display "=== Space #{args.first} has #{snapshots.size} snapshot#{'s' if snapshots.size > 1}"
         snapshots.each do |snapshot|
-          snapshot = snapshot["snapshot"]
           display "#{args.first}@#{snapshot['name']} [created: #{snapshot['created_at']}]"
         end
       end
     end
 
     def create_snapshot
-      space_name, snapshot_name = args[0].split("@")
+      space_name, snapshot_name = args[0..1]
+
+      if snapshot_name.blank?
+        snapshot_name = Time.now.strftime("%Y-%m-%d-%H%M%S")
+      end
 
       strongspace.create_snapshot(space_name, snapshot_name)
-      display "Created snapshot '#{args[0]}'"
+      display "Created snapshot '#{space_name}@#{snapshot_name}'"
+    end
+
+    def create_snapshot_and_thin
+
+      retries = 0
+      success = false
+      while (!success and (retries < 5)) do
+        begin
+          create_snapshot
+          thin_snapshots
+        rescue SocketError => e
+          sleep(10)
+          retries = retries + 1
+          next
+        end
+        success = true
+      end
+
     end
 
     def delete_snapshot
-      space_name, snapshot_name = args[0].split("@")
+      space_name, snapshot_name = args[0..1]
 
       strongspace.delete_snapshot(space_name, snapshot_name)
-      display "Destroyed snapshot '#{args.first}'"
+      display "Destroyed snapshot '#{space_name}@#{snapshot_name}'"
+    end
+
+    def thin_snapshots
+      snapshots = strongspace.snapshots(args.first)
+
+      keeplist = []
+
+      if snapshots.count < 24
+        return
+      end
+
+      snapshots.each do |s|
+
+        if Time.parse(s['created_at']) > (Time.now - 3600*24)
+          keeplist << s
+          next
+        end
+
+      end
+
+      (snapshots - keeplist).each do |k|
+        puts "Drop: " + k['name']
+        strongspace.delete_snapshot(args.first, k['name'])
+      end
+
+    end
+
+
+    def schedule_snapshots
+      space_name = args[0]
+
+      if running_on_a_mac?
+        plist = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+        <!DOCTYPE plist PUBLIC -//Apple Computer//DTD PLIST 1.0//EN
+        http://www.apple.com/DTDs/PropertyList-1.0.dtd >
+        <plist version=\"1.0\">
+        <dict>
+        <key>Label</key>
+        <string>com.strongspace.Snapshots.#{space_name}</string>
+        <key>Program</key>
+        <string>#{support_directory}/gems/bin/strongspace</string>
+        <key>ProgramArguments</key>
+        <array>
+        <string>strongspace</string>
+        <string>spaces:create_snapshot_and_thin</string>
+        <string>#{space_name}</string>
+        </array>
+        <key>KeepAlive</key>
+        <false/>
+        <key>StartCalendarInterval</key>
+        <dict>
+          <key>Minute</key>
+          <integer>0</integer>
+        </dict>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>StandardOutPath</key>
+        <string>#{log_file}</string>
+        <key>StandardErrorPath</key>
+        <string>#{log_file}</string>
+        <key>EnvironmentVariables</key>
+        <dict>
+        <key>GEM_PATH</key>
+        <string>#{support_directory}/gems</string>
+        <key>GEM_HOME</key>
+        <string>#{support_directory}/gems</string>
+        <key>RACK_ENV</key>
+        <string>production</string>
+        </dict>
+
+        </dict>
+        </plist>"
+
+        file = File.new(launchd_plist_file(space_name), "w+")
+        file.puts plist
+        file.close
+
+        r = `launchctl load -S aqua '#{launchd_plist_file(space_name)}'`
+        if r.strip.ends_with?("Already loaded")
+          error "This task is aready scheduled, unload before scheduling again"
+          return
+        end
+        display "Scheduled Snapshots of #{space_name}"
+      end
+    end
+
+    def unschedule_snapshots
+      space_name = args[0]
+
+      if space_name.blank?
+        display "Please supply the name of a space"
+        return false
+      end
+
+      if running_on_windows?
+        error "Scheduling currently isn't supported on Windows"
+        return
+      end
+
+      if running_on_a_mac?
+        if File.exist? launchd_plist_file(space_name)
+          `launchctl unload '#{launchd_plist_file(space_name)}'`
+          FileUtils.rm(launchd_plist_file(space_name))
+        end
+      else  # Assume we're running on linux/unix
+        CronEdit::Crontab.Remove "strongspace-snapshots-#{space_name}"
+      end
+
+      display "Unscheduled snapshotting of #{space_name}"
+    end
+
+
+    private
+    def launchd_plist_file(space_name)
+      "#{launchd_agents_folder}/com.strongspace.Snapshots.#{space_name}.plist"
+    end
+
+    def log_file
+      "#{logs_folder}/Strongspace.log"
     end
 
   end

data/lib/strongspace/exceptions.rb

@@ -0,0 +1,17 @@
+module Strongspace
+  module Exceptions
+    class StrongspaceError < StandardError; end
+
+    class InvalidCredentials < StrongspaceError
+      def message
+        "Invalid Strongspace Credentials"
+      end
+    end
+
+    class NoConnection < StrongspaceError
+      def message
+        "Could not connect to Strongspace"
+      end
+    end
+  end
+end

data/lib/strongspace/helpers.rb

@@ -5,32 +5,77 @@ module Strongspace
       self.class.name.split("::").last
     end
 
-    def home_directory
+    def self.home_directory
       running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
     end
 
+    def home_directory
+      return Strongspace::Helpers.home_directory
+    end
+
+    def self.support_directory
+      running_on_windows? ? "#{home_directory}/Strongspace" : "#{home_directory}/Library/Strongspace"
+    end
+
+    def support_directory
+      return Strongspace::Helpers.support_directory
+    end
+
+    def self.running_on_windows?
+      RUBY_PLATFORM =~ /mswin32|mingw32/
+    end
+
     def running_on_windows?
       RUBY_PLATFORM =~ /mswin32|mingw32/
     end
 
+    def self.running_on_a_mac?
+      RUBY_PLATFORM =~ /-darwin\d/
+    end
+
     def running_on_a_mac?
       RUBY_PLATFORM =~ /-darwin\d/
     end
 
+    def gui_ssh_key
+      "#{credentials_folder}/#{hostname}.rsa"
+    end
+
+    def hostname
+      @hostname ||= `hostname`.strip
+
+      if @hostname.include?(".local")
+        @hostname = @hostname.split(".")[0]
+      end
+      return @hostname
+    end
+
+    def credentials_folder
+      "#{support_directory}/credentials"
+    end
+
     def pids_folder
-      "#{home_directory}/.strongspace/pids"
+      "#{support_directory}/pids"
     end
 
     def plugins_folder
       Strongspace::Plugin.directory
     end
 
+    def logs_folder
+      if running_on_a_mac?
+        "#{home_directory}/Library/Logs/Strongspace"
+      else
+        "#{support_directory}/logs"
+      end
+    end
+
     def bin_folder
-      "#{home_directory}/.strongspace/bin"
+      "#{support_directory}/bin"
     end
 
     def launchd_agents_folder
-      "#{home_directory}/Library/LaunchAgents"
+      "#{support_directory}/LaunchAgents"
     end
 
     def pid_file_path(name)
@@ -58,7 +103,8 @@ module Strongspace
       end
 
       begin
-        # This process is running
+        # This process is running, Kill 0 is a no-op that only works
+        # if the process exists
         Process.kill(0, existing_pid)
         return true
       rescue Errno::EPERM
@@ -165,24 +211,17 @@ module Strongspace
     end
 
     def space_exist?(name)
-      strongspace.spaces["spaces"].each do |space|
+      strongspace.spaces.each do |space|
         # TODO: clean up the json returned by the strongspace API requests to simplify this iteration
-        space = space["space"]
         return true if space["name"] == name
       end
       return false
     end
 
-    def valid_space_name?(name)
-      # For now, just make sure the space name is all "word characters," i.e. [0-9A-Za-z_]
-      return false if name =~ /\W/
-      return true
-    end
 
     def backup_space?(name)
       space = nil
-      strongspace.spaces["spaces"].each do |s|
-        s = s["space"]
+      strongspace.spaces.each do |s|
         if s["name"] == name then
           space = s
           break

data/lib/strongspace/plugin.rb

@@ -1,5 +1,3 @@
-# based on the Rails Plugin
-
 module Strongspace
   class Plugin
     class << self
@@ -9,7 +7,7 @@ module Strongspace
     attr_reader :name, :uri
 
     def self.directory
-      File.expand_path("#{home_directory}/.strongspace/plugins")
+      File.expand_path("#{support_directory}/plugins")
     end
 
     def self.list
@@ -19,6 +17,7 @@ module Strongspace
     end
 
     def self.load!
+      self.update_support_directory!
       list.each do |plugin|
         begin
           load_plugin(plugin)
@@ -26,6 +25,14 @@ module Strongspace
           display "Unable to load plugin: #{plugin}: #{e.message}"
         end
       end
+      self.load_default_gem_plugins
+    end
+
+    def self.load_default_gem_plugins
+      begin
+        require 'strongspace-rsync'
+      rescue Exception => e
+      end
     end
 
     def self.load_plugin(plugin)
@@ -38,6 +45,15 @@ module Strongspace
       FileUtils.rm_rf("#{self.directory}/#{plugin}")
     end
 
+    def self.update_support_directory!
+      if running_on_a_mac?
+        # if File.exist?("#{home_directory}/.strongspace") and !File.exist?("#{support_directory}")
+        #   FileUtils.mv("#{home_directory}/.strongspace", "#{support_directory}")
+        # end
+
+        FileUtils.mkdir_p(launchd_agents_folder) unless File.exist? launchd_agents_folder
+      end
+    end
 
     def initialize(uri)
       @uri = uri

data/lib/strongspace/version.rb

@@ -1,3 +1,3 @@
 module Strongspace
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/auth_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path("./base", File.dirname(__FILE__))
+
+require "strongspace"
+
+def prepare_command(klass)
+  command = klass.new(['--app', 'myapp'])
+  command.stub!(:args).and_return([])
+  command.stub!(:display)
+  command
+end
+
+
+
+describe Strongspace::Command::Auth do
+
+
+
+
+end

data/spec/base.rb

@@ -8,9 +8,7 @@ require 'fileutils'
 require 'tmpdir'
 require 'webmock/rspec'
 
-require 'strongspace/command'
-require 'strongspace/commands/base'
-Dir["#{File.dirname(__FILE__)}/../lib/strongspace/commands/*"].each { |c| require c }
+require 'strongspace'
 
 include WebMock::API
 

data/spec/client_spec.rb

@@ -1,23 +1,42 @@
 require File.expand_path("./base", File.dirname(__FILE__))
 require "cgi"
-require "strongspace/client"
+require "strongspace"
 
 describe Strongspace::Client do
   before do
     @client = Strongspace::Client.new(nil, nil)
   end
 
-  it "Client.auth -> get user details" do
+  it "should return the current version" do
+    Strongspace::Client.version.should == Strongspace::VERSION
+  end
+
+  it "should return a gem version string" do
+    Strongspace::Client.gem_version_string.should == "strongspace-gem/#{Strongspace::VERSION}"
+  end
+
+  it "should return an API key hash for auth" do
     api_token = { "api_key" => "abc" }
     stub_request(:get, "https://foo:bar@www.strongspace.com/api/v1/api_token").to_return(:body => api_token.to_json)
     Strongspace::Client.auth("foo", "bar").should == api_token
   end
 
-  it "list -> get a list of this user's apps" do
+  it "should fail auth gracefully with a bad password" do
+    api_token = { "api_key" => "abc" }
+    stub_request(:get, "https://foo:bar@www.strongspace.com/api/v1/api_token").to_return(:body => api_token.to_json)
+    lambda {Strongspace::Client.auth("foo", "ba3r")}.should raise_error(WebMock::NetConnectNotAllowedError)
+  end
+
+  it "should return nil for username and password" do
+    @client.username.should == nil
+    @client.password.should == nil
+  end
+
+  it "should return an array of spaces" do
     stub_api_request(:get, "/spaces").to_return(:body => <<-EOJSON)
-    {"spaces":[{"space":{"name":"a space", "snapshots":0, "type":"normal"}}, {"space":{"name":"diskimages", "snapshots":0, "type":"normal"}}]}
+    {"spaces" : [{"space":{"name":"a space", "snapshots":0, "type":"normal"}}, {"space":{"name":"diskimages", "snapshots":0, "type":"normal"}}]}
     EOJSON
-    @client.spaces.should == {"spaces"=>[{"space"=>{"name"=>"a space", "snapshots"=>0, "type"=>"normal"}}, {"space"=>{"name"=>"diskimages", "snapshots"=>0, "type"=>"normal"}}]}
+    @client.spaces.should == [{"space"=>{"name"=>"a space", "snapshots"=>0, "type"=>"normal"}}, {"space"=>{"name"=>"diskimages", "snapshots"=>0, "type"=>"normal"}}]
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: strongspace
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Strongspace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2011-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,39 +91,37 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: taps
+  name: webmock
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
+        - 1
+        - 5
         - 0
-        - 3
-        - 11
-        version: 0.3.11
+        version: 1.5.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: ruby-fsevent
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -137,7 +135,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: ruby-fsevent
+  name: sinatra-reloader
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -184,14 +182,14 @@ dependencies:
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 13
         segments: 
         - 1
-        - 7
-        - 0
-        version: 1.7.0
+        - 6
+        - 1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -220,6 +218,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- bin/as_installed/ss
+- bin/as_installed/strongspace
 - bin/ss
 - bin/strongspace
 - lib/strongspace/client.rb
@@ -232,12 +232,14 @@ files:
 - lib/strongspace/commands/plugins.rb
 - lib/strongspace/commands/spaces.rb
 - lib/strongspace/commands/version.rb
+- lib/strongspace/exceptions.rb
 - lib/strongspace/helpers.rb
 - lib/strongspace/plugin.rb
 - lib/strongspace/plugin_interface.rb
 - lib/strongspace/version.rb
 - lib/strongspace.rb
 - README.markdown
+- spec/auth_spec.rb
 - spec/base.rb
 - spec/client_spec.rb
 has_rdoc: true