strongspace 0.0.8 → 0.0.9

data/lib/strongspace/commands/help.rb

@@ -41,7 +41,14 @@ module Strongspace::Command
 
       group 'SSH Keys' do |group|
         group.command 'keys',                         'show your user\'s public keys'
-        group.command 'keys:add [<path to keyfile>]', 'add a public key'
+
+        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:generate',                'Generate a new SSH keypair'
+        else
+          group.command 'keys:add [<path to keyfile>]', 'Add an public key'
+        end
+
         group.command 'keys:remove <id> ',            'remove a key by id'
         group.command 'keys:clear',                   'remove all keys'
       end

data/lib/strongspace/commands/keys.rb

@@ -14,6 +14,12 @@ module Strongspace::Command
     end
     alias :index :list
 
+    def generate
+      `ssh-keygen`
+      return ($? == 0)
+    end
+
+
     def add
       keyfile = args.first || find_key
       key = File.read(keyfile)
@@ -39,7 +45,21 @@ module Strongspace::Command
           keyfile = "#{home_directory}/.ssh/id_#{key_type}.pub"
           return keyfile if File.exists? keyfile
         end
-        raise CommandFailed, "No ssh public key found in #{home_directory}/.ssh/id_[rd]sa.pub.  You may want to specify the full path to the keyfile."
+
+
+        display "No ssh public key found in #{home_directory}/.ssh/id_[rd]sa.pub"
+        if not running_on_windows?
+          display "  Generate a new key? [yes/no]: ", false
+          answer = ask("no")
+          if answer.downcase == "yes" or answer.downcase == "y"
+            r = Strongspace::Command.run_internal("keys:generate", nil)
+            if r
+              return find_key
+            end
+          end
+        end
+
+        raise CommandFailed, "No ssh public key available"
       end
 
       def format_key_for_display(key)

data/lib/strongspace/helpers.rb

@@ -1,5 +1,10 @@
 module Strongspace
   module Helpers
+
+    def command_name
+      self.class.name.split("::").last
+    end
+
     def home_directory
       running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
     end
@@ -24,6 +29,72 @@ module Strongspace
       "#{home_directory}/.strongspace/bin"
     end
 
+    def launchd_agents_folder
+      "#{home_directory}/Library/LaunchAgents"
+    end
+
+    def pid_file_path(name)
+      "#{pids_folder}/#{name}"
+    end
+
+    def pid_from_pid_file(name)
+      if File.exist?(pid_file_path(name))
+
+        f = File.open(pid_file_path(name))
+        existing_pid = Integer(f.gets)
+        f.close
+
+        return existing_pid
+      end
+
+      return nil
+    end
+
+    def process_running?(name)
+      existing_pid = pid_from_pid_file(name)
+
+      if not existing_pid
+        return false
+      end
+
+      begin
+        # This process is running
+        Process.kill(0, existing_pid)
+        return true
+      rescue Errno::EPERM
+        error "No longer have permissions to check this PID"
+      rescue Errno::ESRCH
+        # Cleanup orphaned pid file and continue on as normal
+        File.unlink(pid_file_path(name))
+      rescue
+        error "Unable to determine status for #{existing_pid} : #{$!}"
+      end
+
+      return false
+      end
+
+    def create_pid_file(name, pid)
+
+      if process_running?(name)
+        return nil
+      end
+
+      if not File.exist?(pids_folder)
+        FileUtils.mkdir_p(pids_folder)
+      end
+
+      file = File.new(pid_file_path(name), "w")
+      file.puts "#{pid}"
+      file.close
+
+      return true
+    end
+
+    def delete_pid_file(name)
+      if File.exist?(pid_file_path(name))
+        File.unlink(pid_file_path(name))
+      end
+    end
 
     def display(msg, newline=true)
       if newline
@@ -82,7 +153,7 @@ module Strongspace
 
     def ask(default=nil)
       r = gets.strip
-      if not r or r.length
+      if r.blank?
         return default
       else
         return r
@@ -95,6 +166,34 @@ module Strongspace
   end
 end
 
+unless Object.method_defined?(:blank?)
+  class Object
+    def blank?
+      respond_to?(:empty?) ? empty? : !self
+    end
+  end
+end
+
+unless String.method_defined?(:starts_with?)
+  class String
+    def starts_with?(str)
+      str = str.to_str
+      head = self[0, str.length]
+      head == str
+    end
+  end
+end
+
+unless String.method_defined?(:ends_with?)
+  class String
+    def ends_with?(str)
+      str = str.to_str
+      tail = self[-str.length, str.length]
+      tail == str
+    end
+  end
+end
+
 unless String.method_defined?(:shellescape)
   class String
     def shellescape
@@ -109,4 +208,12 @@ unless String.method_defined?(:camelize)
       self.split(/[^a-z0-9]/i).map{|w| w.capitalize}.join
     end
   end
+end
+
+unless String.method_defined?(:underscore)
+  class String
+    def underscore
+      self.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase
+    end
+  end
 end

data/lib/strongspace/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: strongspace
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Strongspace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -05:00
+date: 2010-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency