strongspace 0.0.9 → 0.1.1

data/README.markdown

@@ -15,33 +15,41 @@ Install:
     `gem install strongspace`
 
 Run via command line:
-`strongspace help`
+`strongspace help` or `ss help`
 
     === General Commands
-    help                                              # show this usage
-    version                                           # show the gem version
+    help                                        # show this usage
+    version                                     # show the gem version
 
-    upload <local_file> <remote_path>                 # upload a file
-    download <remote_path>                            # download a file from Strongspace to the current directory
-    mkdir <remote_path>                               # create a folder on Strongspace
-    delete <remote_path>                              # delete a file or recursively delete a folder on Strongspace
+    upload <local_path> <remote_path>           # upload a file
+    download <remote_path>                      # download a file from Strongspace to the current directory
+    mkdir <remote_path>                         # create a folder on Strongspace
+    delete <remote_path>                        # delete a file or recursively delete a folder on Strongspace
 
     === SSH Keys
-    keys                                              # show your user's public keys
-    keys:add [<path to keyfile>]                      # add a public key
-    keys:remove <id>                                  # remove a key by id
-    keys:clear                                        # remove all keys
+    keys                                        # show your user's public keys
+    keys:add [<keyfile_path>]                   # Add an public key or generate a new SSH keypair and add
+    keys:generate                               # Generate a new SSH keypair
+    keys:remove <id>                            # remove a key by id
+    keys:clear                                  # remove all keys
 
     === Spaces
-    spaces                                            # show your user's spaces
-    spaces:create <space_name> [type]                 # add a new space. type => (normal,public,backup)
-    spaces:delete <space_name> [type]                 # remove a space by and destroy its data
-    spaces:snapshots <space_name>                     # show a space's snapshots
-    spaces:create_snapshot <space_name@snapshot_name> # take a space of a space.
-    spaces:delete_snapshot <space_name@snapshot_name> # remove a snapshot from a space
-
-
-
+    spaces                                      # show your user's spaces
+    spaces:create <name> [type]                 # add a new space. type => (normal,public,backup)
+    spaces:delete <name> [type]                 # remove a space by and destroy its data
+    spaces:snapshots <name>                     # show a space's snapshots
+    spaces:create_snapshot <name@snapshot_name> # take a space of a space.
+    spaces:delete_snapshot <name@snapshot_name> # remove a snapshot from a space
+
+    === Plugins
+    plugins                                     # list installed plugins
+    plugins:install <url>                       # install the plugin from the specified git url
+    plugins:uninstall <url/name>                # remove the specified plugin
+
+
+Plugins
+------
+Check out our sample [Rsync Plugin](https://github.com/expandrive/strongspace-rsync) as an example of how to add functionality
 
 
 Meta

data/bin/ss

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'strongspace'
+require 'strongspace/command'
+
+args = ARGV.dup
+ARGV.clear
+command = args.shift.strip rescue 'help'
+
+Strongspace::Command.run(command, args)
+

data/lib/strongspace/command.rb

@@ -16,6 +16,11 @@ module Strongspace
       def run(command, args, retries=0)
         Strongspace::Plugin.load!
         begin
+          # internal-only commands cannot be be run from the command line
+          if command.index(":_")
+            raise InvalidCommand
+          end
+
           run_internal 'auth:reauthorize', args.dup if retries > 0
           run_internal(command, args.dup)
         rescue InvalidCommand

data/lib/strongspace/commands/help.rb

@@ -33,7 +33,7 @@ module Strongspace::Command
         group.command 'help',                         'show this usage'
         group.command 'version',                      'show the gem version'
         group.space
-        group.command 'upload <local_file> <remote_path>',      'upload a file'
+        group.command 'upload <local_path> <remote_path>',      'upload a file'
         group.command 'download <remote_path>',      'download a file from Strongspace to the current directory'
         group.command 'mkdir <remote_path>',      'create a folder on Strongspace'
         group.command 'delete <remote_path>',      'delete a file or recursively delete a folder on Strongspace'
@@ -43,10 +43,10 @@ module Strongspace::Command
         group.command 'keys',                         'show your user\'s public keys'
 
         if not RUBY_PLATFORM =~ /mswin32|mingw32/
-          group.command 'keys:add [<path to keyfile>]', 'Add an public key or generate a new SSH keypair and add'
+          group.command 'keys:add [<keyfile_path>]', 'Add an public key or generate a new SSH keypair and add'
           group.command 'keys:generate',                'Generate a new SSH keypair'
         else
-          group.command 'keys:add [<path to keyfile>]', 'Add an public key'
+          group.command 'keys:add [<keyfile_path>]', 'Add an public key'
         end
 
         group.command 'keys:remove <id> ',            'remove a key by id'
@@ -55,11 +55,11 @@ module Strongspace::Command
 
       group 'Spaces' do |group|
         group.command 'spaces',                        'show your user\'s spaces'
-        group.command 'spaces:create <space_name> [type]',        'add a new space. type => (normal,public,backup)'
-        group.command 'spaces:delete <space_name> [type]',       'remove a space by and destroy its data'
-        group.command 'spaces:snapshots <space_name>',                        'show a space\'s snapshots'
-        group.command 'spaces:create_snapshot <space_name@snapshot_name>',            'take a space of a space.'
-        group.command 'spaces:delete_snapshot <space_name@snapshot_name>',         'remove a snapshot from a space'
+        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'
       end
 
       group 'Plugins' do |group|

data/lib/strongspace/helpers.rb

@@ -163,6 +163,36 @@ module Strongspace
     def shell(cmd)
       FileUtils.cd(Dir.pwd) {|d| return `#{cmd}`}
     end
+
+    def space_exist?(name)
+      strongspace.spaces["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"]
+        if s["name"] == name then
+          space = s
+          break
+        end
+      end
+      return space["type"] == "backup"
+    end
+
+
+
   end
 end
 

data/lib/strongspace/version.rb

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

data/spec/base.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+
+# ruby 1.9.2 drops . from the load path
+$:.unshift File.expand_path("../..", __FILE__)
+
+require 'spec'
+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 }
+
+include WebMock::API
+
+def stub_api_request(method, path)
+  stub_request(method, "https://www.strongspace.com/api/v1#{path}")
+end

data/spec/client_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path("./base", File.dirname(__FILE__))
+require "cgi"
+require "strongspace/client"
+
+describe Strongspace::Client do
+  before do
+    @client = Strongspace::Client.new(nil, nil)
+  end
+
+  it "Client.auth -> get user details" 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
+    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"}}]}
+    EOJSON
+    @client.spaces.should == {"spaces"=>[{"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: 13
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 9
-  version: 0.0.9
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Strongspace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,9 +33,51 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ZenTest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: autotest-fsevent
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +89,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: taps
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +105,11 @@ dependencies:
         - 11
         version: 0.3.11
   type: :development
-  version_requirements: *id003
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +121,11 @@ dependencies:
         - 0
         version: 1.5.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +135,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby-fsevent
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +149,39 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: cronedit
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -123,11 +193,11 @@ dependencies:
         - 0
         version: 1.7.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -139,16 +209,18 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id013
 description: Client library and command line tool for Strongspace.
 email: support@strongspace.com
 executables: 
 - strongspace
+- ss
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
+- bin/ss
 - bin/strongspace
 - lib/strongspace/client.rb
 - lib/strongspace/command.rb
@@ -166,6 +238,8 @@ files:
 - lib/strongspace/version.rb
 - lib/strongspace.rb
 - README.markdown
+- spec/base.rb
+- spec/client_spec.rb
 has_rdoc: true
 homepage: http://github.com/expandrive/strongspace
 licenses: []