sshelper 0.1.1 → 0.1.2

data/README.md

@@ -1,4 +1,4 @@
-# Sshelper
+# SSHelper
 
 This gem is supposed to make your life easier if you have to do a lot of repetitive tasks over SSH. If you are sick 
 of doing the constant ```ssh user@example.org```, ```cd /opt/path/to/something```, ```./start.sh``` 

data/bin/sshelper

@@ -15,15 +15,18 @@ global = OptionParser.new do |opts|
     puts "Labels:"
     Sshelper.prepare!
     Sshelper.configuration.each do |key, value|
-      puts "\t#{key.to_s}: #{value.description}"
+      puts "\t#{key.to_s.yellow}: #{value.description.blue if value.member? 'description'}"
     end
     puts "\n\n"
     exit!
   end
   
-  opts.on("-t", "--template", "Place a template configuration at ~/.sshelper.json") do
-    template = IO.read(File.expand_path('../../resources/template.json', __FILE__))
-    File.open(File.expand_path("~/.sshelper.json"), "w") { |f| f.write template }
+  opts.on("-t", "--template [TYPE]", "Generate a template in your home folder (~/.sshelper.{yml|json}). For type choose either YAML/YML or JSON.") do |type|
+    ext = "json"
+    ext = "yml" if type.downcase =~ /ya?ml/
+      
+    template = IO.read(File.expand_path("../../resources/template.#{ext}", __FILE__))
+    File.open(File.expand_path("~/.sshelper.#{ext}"), "w") { |f| f.write template }
     exit!
   end
 end

data/lib/sshelper.rb

@@ -3,18 +3,32 @@ require "sshelper/hash"
 require "sshelper/string"
 require 'rye'
 require "json"
+require "yaml"
 require "fileutils"
 
 module Sshelper
   @config
   
   def self.prepare!
-    raise "Needs configuration file" unless File.exists? File.expand_path("~/.sshelper.json")
+    @config ||= {}
+    if File.exists? File.expand_path("~/.sshelper.json") then
+      begin 
+        @config.merge! JSON.parse IO.read(File.expand_path("~/.sshelper.json"))
+      rescue
+        puts "An error occurred while parsing your JSON configuration."
+      end
+    end
+    
+    if File.exists? File.expand_path("~/.sshelper.yml") then
+      begin 
+        @config.merge! YAML.load_file File.expand_path("~/.sshelper.yml")
+      rescue
+        puts "An error occurred while parsing your yaml configuration."
+      end
+    end
     
-    begin 
-      @config ||= JSON.parse IO.read(File.expand_path("~/.sshelper.json"))
-    rescue
-      puts "An error occurred while parsing your configuration file."
+    if @config.empty? then
+      puts "Your configuration is empty, make sure you have a ~/.sshelper.json and/or a ~/.sshelper.yml config file"
     end
   end
   
@@ -22,17 +36,17 @@ module Sshelper
     return if label.nil?
     labels = @config.map { |key, value| key }
     if not labels.include? label then
-      puts "Could not find that label."
+      puts "Could not find that label.".yellow
       return
     end
     
     if not @config[label].include? "servers" or not @config[label].include? "commands" then
-      puts "The configuration file does not contain a 'servers' array or a 'commands' array"
+      puts "The configuration file does not contain a 'servers' array or a 'commands' array".yellow
       return
     end
     
     if not @config[label].servers.is_a? Array or not @config[label].commands.is_a? Array then
-      puts "The servers and commands block need to be arrays."
+      puts "The servers and commands block need to be arrays.".yellow
       return
     end
     
@@ -45,7 +59,7 @@ module Sshelper
       @config[label].commands.each do |command|
         puts "\nExecuting: #{command}".red
         puts '#### OUTPUT ####'.blue
-        if command.start_with? "cd" then
+        if command.start_with? "cd " then
           rbox.cd command.split(' ', 2).last
         else
           puts "#{rbox.execute(command).stdout.map{ |k| "~> #{k}" }.join("\n") }"

data/lib/sshelper/version.rb

@@ -1,3 +1,3 @@
 module Sshelper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/resources/template.yml

@@ -0,0 +1,9 @@
+my_label1:
+  description: Some description
+  servers:
+    - host: my.host.com
+      port: 22
+      user: my_user
+  commands:
+    - cd /opt
+    - ls -l

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshelper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/sshelper/string.rb
 - lib/sshelper/version.rb
 - resources/template.json
+- resources/template.yml
 - spec/spec_helper.rb
 - spec/sshelper_spec.rb
 - sshelper.gemspec