strongspace 0.2.0 → 0.3.5

data/bin/as_installed/ss

@@ -16,4 +16,9 @@ if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
 end
 
 gem 'strongspace', version
-load 'strongspace'
+
+begin
+  load Gem.bin_path('strongspace', 'strongspace', version)
+rescue
+  load 'strongspace'
+end

data/bin/as_installed/strongspace

@@ -16,5 +16,9 @@ if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
 end
 
 gem 'strongspace', version
-load 'strongspace'
 
+begin
+  load Gem.bin_path('strongspace', 'strongspace', version)
+rescue
+  load 'strongspace'
+end

data/lib/strongspace/client.rb

@@ -62,8 +62,13 @@ class Strongspace::Client
     doc = delete("/api/v1/files/#{escape(path[1..-1])}")
   end
 
+  def size(path)
+    doc = JSON.parse get("/api/v1/files/#{escape(path[1..-1])}?op=size")
+  end
+
   def spaces
     doc = JSON.parse get('/api/v1/spaces')
+    doc["spaces"]
   end
 
   def delete_space(space_name)
@@ -91,6 +96,10 @@ class Strongspace::Client
     doc = JSON.parse post("/api/v1/spaces/#{escape(space_name)}/snapshots", :name => snapshot_name)
   end
 
+  def filesystem
+    doc = JSON.parse get("/api/v1/filesystem").to_s
+    doc["filesystem"]
+  end
 
   # Get the list of ssh public keys for the current user.
   def keys

data/lib/strongspace/command.rb

@@ -19,8 +19,15 @@ module Strongspace
           run_internal(command, args.dup)
         rescue InvalidCommand
           error "Unknown command. Run 'strongspace help' for usage information."
+        rescue Strongspace::Exceptions::InvalidCredentials
+          if retries < 1
+            STDERR.puts "Authentication failure"
+            run(command, args, retries+1)
+          else
+            error "! Authentication failure"
+          end
         rescue RestClient::Unauthorized
-          if retries < 3
+          if retries < 1
             STDERR.puts "Authentication failure"
             run(command, args, retries+1)
           else

data/lib/strongspace/commands/auth.rb

@@ -27,9 +27,9 @@ module Strongspace::Command
 
     def authorize!
       @credentials = [args.first, args[1]]
-      r = Strongspace::Client.auth(@credentials[0], @credentials[1])
+      r = Strongspace::Client.auth(@credentials[0], @credentials[1], host)
       if r
-        @credentials[0] = "#{@credentials[0]}/token"
+        @credentials[0] = r['username']
         @credentials[1] = r['api_token']
         write_credentials
         return true
@@ -58,10 +58,6 @@ module Strongspace::Command
       @credentials[1]
     end
 
-    def credentials_file
-      "#{credentials_folder}/credentials"
-    end
-
     def get_credentials    # :nodoc:
       return if @credentials
       unless @credentials = read_credentials
@@ -84,6 +80,10 @@ module Strongspace::Command
     end
 
     def ask_for_credentials
+      if ENV["STRONGSPACE_DISPLAY"] == "silent"
+        return [nil, nil]
+      end
+
       puts "Enter your Strongspace credentials."
 
       print "Username or Email: "
@@ -92,13 +92,14 @@ module Strongspace::Command
       print "Password: "
       password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
 
-      ["#{user}/token", Strongspace::Client.auth(user, password, host)['api_token']]
+      r = Strongspace::Client.auth(user, password, host)
+      [r['username'], r['api_token']]
     end
 
     def valid_saved_credentials?
       if File.exists?(credentials_file)
         credentials = read_credentials
-        r = Strongspace::Client.auth(credentials[0], credentials[1])
+        r = Strongspace::Client.auth(credentials[0], credentials[1], host)
         return !r.blank?
       end
       return false
@@ -131,6 +132,13 @@ module Strongspace::Command
     end
 
     def save_credentials
+
+      if args[0] and args[1]
+        @credentials = []
+        @credentials[0] = args[0]
+        @credentials[1] = args[1]
+      end
+
       begin
         write_credentials
         command = 'auth:check'

data/lib/strongspace/commands/files.rb

@@ -55,4 +55,26 @@ module Strongspace::Command
     end
   end
 
+  class Quota < Base
+    def index
+
+      f = strongspace.filesystem
+      display "#{strongspace.username}:"
+      display "       Quota: #{f["quota_gib"]} GiB"
+      display "        Used: #{f["used_gib"]} GiB"
+      display "   Available: #{f["avail_gib"]} GiB"
+    end
+  end
+
+  class Size < Base
+    def index
+      if args.length != 1
+        error "please supply a remote path"
+      end
+
+      r = strongspace.size(args[0])
+      puts r
+    end
+  end
+
 end

data/lib/strongspace/commands/keys.rb

@@ -30,9 +30,9 @@ module Strongspace::Command
       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"
+      if !File.exist? "#{credentials_folder}/#{computername}.rsa"
+        `/usr/bin/ssh-keygen -f \"#{credentials_folder}/#{computername}.rsa\" -b 2048 -C \" Strongspace App - #{computername}\" -q -N ""` unless File.exist? "#{credentials_folder}/#{computername}.rsa"
+        args[0] = "#{credentials_folder}/#{computername}.rsa.pub"
         begin
           add
         rescue RestClient::Conflict => e # Swallow errors if the key already exists on Strongspace
@@ -62,7 +62,7 @@ module Strongspace::Command
     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`
+      ret = `ssh -o PreferredAuthentications=publickey -i "#{support_directory}/ssh/#{computername}.rsa" #{strongspace.username}@#{strongspace.username}.strongspace.com 2>&1`
 
       if ret.include? "Strongspace"
         display "Valid key installed"

data/lib/strongspace/commands/spaces.rb

@@ -63,7 +63,7 @@ module Strongspace::Command
       while (!success and (retries < 5)) do
         begin
           create_snapshot
-          thin_snapshots
+          #thin_snapshots
         rescue SocketError => e
           sleep(10)
           retries = retries + 1
@@ -86,17 +86,11 @@ module Strongspace::Command
 
       keeplist = []
 
-      if snapshots.count < 24
-        return
-      end
-
       snapshots.each do |s|
-
-        if Time.parse(s['created_at']) > (Time.now - 3600*24)
+        if DateTime.parse(s['created_at']).to_local_time > (Time.now - 3600*24)
           keeplist << s
           next
         end
-
       end
 
       (snapshots - keeplist).each do |k|
@@ -141,6 +135,8 @@ module Strongspace::Command
         <string>#{log_file}</string>
         <key>EnvironmentVariables</key>
         <dict>
+        <key>STRONGSPACE_DISPLAY</key>
+        <string>logging</string>
         <key>GEM_PATH</key>
         <string>#{support_directory}/gems</string>
         <key>GEM_HOME</key>
@@ -187,7 +183,6 @@ module Strongspace::Command
         CronEdit::Crontab.Remove "strongspace-snapshots-#{space_name}"
       end
 
-      display "Unscheduled snapshotting of #{space_name}"
     end
 
 
@@ -202,3 +197,4 @@ module Strongspace::Command
 
   end
 end
+

data/lib/strongspace/helpers.rb

@@ -38,22 +38,38 @@ module Strongspace
     end
 
     def gui_ssh_key
-      "#{credentials_folder}/#{hostname}.rsa"
+      "#{credentials_folder}/#{computername}.rsa"
     end
 
-    def hostname
-      @hostname ||= `hostname`.strip
+    def computername
+      n = File.read(credentials_file).split("\n")[2]
 
-      if @hostname.include?(".local")
-        @hostname = @hostname.split(".")[0]
+      if n.blank?
+        @computername ||= `system_profiler  SPSoftwareDataType | grep "Computer Name"`.split(":").last.gsub(/[[:punct:][:cntrl:]]/, '')
+
+        if @computername.include?(".local")
+          @computername = @computername.split(".")[0]
+        end
+
+        File.open(credentials_file, 'a') do |f|
+          f.puts @computername
+        end
+
+      else
+        @computername = n.strip
       end
-      return @hostname
+
+      return @computername
     end
 
     def credentials_folder
       "#{support_directory}/credentials"
     end
 
+    def credentials_file
+      "#{credentials_folder}/credentials"
+    end
+
     def pids_folder
       "#{support_directory}/pids"
     end
@@ -95,6 +111,34 @@ module Strongspace
       return nil
     end
 
+    def kill_via_pidfile(name)
+      existing_pid = pid_from_pid_file(name)
+
+      if not existing_pid
+        return false
+      end
+
+      begin
+        # This process is running, Kill 0 is a no-op that only works
+        # if the process exists
+        Process.kill(9, existing_pid)
+        return true
+      rescue Errno::EPERM
+        error "No longer have permissions to check this PID"
+        return
+      rescue Errno::ESRCH
+        # Cleanup orphaned pid file and continue on as normal
+        File.unlink(pid_file_path(name))
+        return
+      rescue
+        error "Unable to determine status for #{existing_pid} : #{$!}"
+        return
+      end
+
+      File.unlink(pid_file_path(name))
+      return false
+    end
+
     def process_running?(name)
       existing_pid = pid_from_pid_file(name)
 
@@ -117,7 +161,7 @@ module Strongspace
       end
 
       return false
-      end
+    end
 
     def create_pid_file(name, pid)
 
@@ -143,6 +187,9 @@ module Strongspace
     end
 
     def display(msg, newline=true)
+      if ENV["STRONGSPACE_DISPLAY"] == "silent"
+        return
+      end
       if newline
         puts(msg)
       else

data/lib/strongspace/version.rb

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

data/spec/client_spec.rb

@@ -16,13 +16,13 @@ describe Strongspace::Client do
   end
 
   it "should return an API key hash for auth" do
-    api_token = { "api_key" => "abc" }
+    api_token = { "api_key" => "abc", "username" => "foo/token" }
     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 "should fail auth gracefully with a bad password" do
-    api_token = { "api_key" => "abc" }
+    api_token = { "api_key" => "abc", "username" => "foo/token" }
     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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: strongspace
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 0
-  version: 0.2.0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Strongspace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -05:00
+date: 2011-02-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,24 +60,10 @@ dependencies:
         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 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,11 +75,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,11 +91,11 @@ dependencies:
         - 0
         version: 1.5.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-fsevent
+  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,11 +105,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: sinatra-reloader
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,25 +119,26 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sinatra-reloader
+  name: hoptoad_notifier
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 4
+        version: "2.4"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +148,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cronedit
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,11 +162,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -191,11 +178,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -207,7 +194,7 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id012
 description: Client library and command line tool for Strongspace.
 email: support@strongspace.com
 executables: 
@@ -272,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Client library and CLI for Strongspace.