rutty 2.0.0 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/bin/rutty

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'rubygems'
 require 'commander/import'
 require 'rutty'
@@ -21,13 +23,26 @@ program :help_formatter, Commander::HelpFormatter::TerminalCompact
 
 default_command :dsh
 
+global_option '-c', '--config DIR', 'Directory to load configs from, defaults to ~/.rutty' do |dir|
+  begin
+    $r.config File.join(dir, Rutty::Consts::GENERAL_CONF_FILE)
+    $r.nodes File.join(dir, Rutty::Consts::NODES_CONF_FILE)
+  rescue Errno::ENOENT => e
+    if e.to_s =~ /No such file or directory - (.*)/
+      raise Rutty::NotInstalledError.new "Unable to find #{$1}. Maybe run `rutty init #{dir}' first?"
+    end
+  end
+end
+
 # Commander commands
 command :init do |c|
-  c.syntax = "rutty init"
-  c.summary = "Creates the default file structure for rutty."
-  c.when_called do
-    r = Rutty::Runner.new
-    r.init
+  c.syntax = "rutty init [DIR]"
+  c.summary = "Creates the default file structure for rutty"
+  c.description = "#{c.summary} in the specified DIR. If DIR is not given, defaults to ~/.rutty"
+  c.when_called do |args, options|
+    args.push Rutty::Consts::CONF_DIR if args.empty?
+    
+    $r.init args.pop
   end
 end
 
@@ -43,8 +58,7 @@ command :add_node do |c|
   add_filter_options.call(c)
   
   c.when_called do |args, options|
-    r = Rutty::Runner.new
-    r.add_node args, options
+    $r.add_node args, options
   end
 end
 
@@ -61,8 +75,7 @@ command :list_nodes do |c|
   add_filter_options.call(c)
   
   c.when_called do |args, options|
-    r = Rutty::Runner.new
-    r.list_nodes args, options
+    $r.list_nodes args, options
   end
 end
 
@@ -78,8 +91,7 @@ command :dsh do |c|
   c.option('-d', '--debug', 'Enable debug output')
   
   c.when_called do |args, options|
-    r = Rutty::Runner.new
-    r.dsh args, options
+    $r.dsh args, options
   end
 end
 
@@ -93,8 +105,7 @@ command :scp do |c|
   c.option('-d', '--debug', 'Enable debug output')
   
   c.when_called do |args, options|
-    r = Rutty::Runner.new
-    r.dsh args, options
+    $r.dsh args, options
   end
 end
 

data/lib/rutty.rb

@@ -16,12 +16,12 @@ module Rutty
     include Rutty::Helpers
     include Rutty::Actions
   
-    def config
-      @config ||= Rutty::Config.load_config
+    def config file = Rutty::Consts::GENERAL_CONF
+      @config ||= Rutty::Config.load_config file
     end
   
-    def nodes
-      @nodes ||= Rutty::Nodes.load_config
+    def nodes file = Rutty::Consts::NODES_CONF
+      @nodes ||= Rutty::Nodes.load_config file
     end
   end
 end

data/lib/rutty/actions.rb

@@ -2,18 +2,21 @@ require 'rutty/consts'
 
 module Rutty
   module Actions
-    def init
-      if File.exists? Rutty::Consts::CONF_DIR
-        log "exists", Rutty::Consts::CONF_DIR
+    def init dir
+      general_file = File.join(dir, Rutty::Consts::GENERAL_CONF_FILE)
+      nodes_file = File.join(dir, Rutty::Consts::NODES_CONF_FILE)
+      
+      if File.exists? dir
+        log "exists", dir
       else
-        log "create", Rutty::Consts::CONF_DIR
-        Dir.mkdir Rutty::Consts::CONF_DIR
+        log "create", dir
+        Dir.mkdir dir
       end
 
-      if File.exists? Rutty::Consts::GENERAL_CONF
-        log "exists", Rutty::Consts::GENERAL_CONF
+      if File.exists? general_file
+        log "exists", general_file
       else
-        log "create", Rutty::Consts::GENERAL_CONF
+        log "create", general_file
 
         defaults_hash = { 
           :user => 'root', 
@@ -21,17 +24,17 @@ module Rutty
           :port => 22
         }
 
-        File.open(Rutty::Consts::GENERAL_CONF, 'w') do |f|
+        File.open(general_file, 'w') do |f|
           YAML.dump(defaults_hash, f)
         end
       end
 
-      if File.exists? Rutty::Consts::NODES_CONF
-        log "exists", Rutty::Consts::NODES_CONF
+      if File.exists? nodes_file
+        log "exists", nodes_file
       else
-        log "create", Rutty::Consts::NODES_CONF
+        log "create", nodes_file
 
-        File.open(Rutty::Consts::NODES_CONF, 'w') do |f|
+        File.open(nodes_file, 'w') do |f|
           YAML.dump([], f)
         end
       end

data/lib/rutty/config.rb

@@ -2,10 +2,10 @@
 module Rutty
   class Config
     class << self
-      def load_config
+      def load_config file
         require 'yaml'
         
-        data = YAML.load(File.open(Rutty::Consts::GENERAL_CONF).read)
+        data = YAML.load(File.open(file).read)
         Rutty::Config.new data
       end
     end

data/lib/rutty/consts.rb

@@ -1,7 +1,10 @@
 module Rutty
   module Consts
+    GENERAL_CONF_FILE = 'defaults.yaml'
+    NODES_CONF_FILE = 'nodes.yaml'
+    
     CONF_DIR = File.join(ENV['HOME'], '.rutty')
-    GENERAL_CONF = File.join(CONF_DIR, 'defaults.yaml')
-    NODES_CONF = File.join(CONF_DIR, 'nodes.yaml')
+    GENERAL_CONF = File.join(CONF_DIR, GENERAL_CONF_FILE)
+    NODES_CONF = File.join(CONF_DIR, NODES_CONF_FILE)
   end
 end

data/lib/rutty/nodes.rb

@@ -4,9 +4,9 @@ require 'rutty/consts'
 module Rutty
   class Nodes < Array
     class << self
-      def load_config
+      def load_config file
         require 'yaml'
-        Rutty::Nodes.new YAML.load(File.open(Rutty::Consts::NODES_CONF).read)
+        Rutty::Nodes.new YAML.load(File.open(file).read)
       end
     end
     

data/lib/rutty/version.rb

@@ -1,7 +1,7 @@
 module Rutty
   module Version
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     BUILD = nil
 

data/rutty.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutty}
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lindsey"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-11-03}
   s.default_executable = %q{rutty}
   s.description = %q{
       RuTTY is a DSH (distributed / dancer's shell) written in Ruby. It's used to run commands 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutty
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Josh Lindsey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: rutty
 dependencies: 
 - !ruby/object:Gem::Dependency