uberssh 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ceb1a29c2b813d5df35a33cd0692de1f2bc2bd
-  data.tar.gz: c272b3853e0a0389356f2d97bcbc87de93b71ffe
+  metadata.gz: 12dd63cee0251013a6e9232d122f0042a2cb2dc6
+  data.tar.gz: 6af7485090d6997bb95887f5eb6217a38cd311ef
 SHA512:
-  metadata.gz: 30efa33ed2656808ba981f185b5e6e1c615ed8168541804a699df811dda5dd36521eb532125d509006bbab7ebd250023a9e0a9ea3e27f4d5215647eb8766c11a
-  data.tar.gz: 18885444f600606bfc994273c5459b87e5264fac1c1ad6f77f4a8574e0387dd0cbc7b15bad24ee860527262fa564d561b501b40de2237e7293fff5869f161c86
+  metadata.gz: c9e578675128cfc4243a31f88ddd0f1128cfbe4eaf0c0570c5ac51e90c627c470f5f8d0d972e5f998aaa66a41edad2c693f9ef76495149fb70bd54442caeae75
+  data.tar.gz: d8452a64b0b14677f42aa3d30e7f2bebe05587742309c191997840e82790241e9beb82f5c988b0d65e97db3b4a776c331bb28b02eb7a4fc4b1b404eabb1e0ffd

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.2
+  - 2.2.0
+
+before_install: gem update bundler
+
+script: bundle exec rspec

data/README.md

@@ -1,5 +1,7 @@
 # Uberssh
 
+[![Tag](https://img.shields.io/github/tag/baschtl/uberssh.svg?style=flat-square)](https://github.com/baschtl/uberssh/releases) [![Build Status](https://img.shields.io/travis/baschtl/uberssh.svg?style=flat-square)](https://travis-ci.org/baschtl/uberssh) [![Code Climate](https://img.shields.io/codeclimate/github/baschtl/uberssh.svg?style=flat-square)](https://codeclimate.com/github/baschtl/uberssh)
+
 Uberssh is a script to select to which of your [Uberspaces](https://uberspace.de/) you want to connect to via ssh in just a few key strokes.
 
 The script was initially written by [pixelpogo](https://github.com/pixelpogo/).
@@ -21,16 +23,20 @@ To install the gem use the following command:
     foo:                              # your Uberspace account name
       project: "My Foo"               # an arbitrary description of the project
       hostname: cepheus.uberspace.de  # the hostname of your Uberspace
-      ssh-key: ~/.ssh/uberspace_rsa   # the ssh key used to connect to your Uberspace
+      ssh_key: ~/.ssh/uberspace_rsa   # the ssh key used to connect to your Uberspace
     bar:
       project: "My Bar"
       hostname: perseus.uberspace.de
-      ssh-key: ~/.ssh/uberspace_rsa
+      ssh_key: ~/.ssh/uberspace_rsa
     # ...
   ```
 
 3. Run `uberssh` from your command line.
 
+## Upgrading from 0.1.0 to 0.2.0
+
+The configuration file format has changed slightly in version 0.2.0. The name of the key `ssh-key` was changed to `ssh_key`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec uberssh` to use the code located in this directory, ignoring other installed copies of this gem.

data/exe/uberssh

@@ -3,4 +3,4 @@
 require "bundler/setup"
 require "uberssh"
 
-Uberssh.connect!
+Uberssh.run

data/lib/uberssh.rb

@@ -1,29 +1,31 @@
-require "uberssh/version"
+require "uberssh/app"
+require "uberssh/account"
 require "uberssh/account_manager"
+require "uberssh/version"
 
 require 'optparse'
-require 'ostruct'
 require 'etc'
+require 'yaml'
 
 module Uberssh
 
-  def self.connect!
-    options = OpenStruct.new
+  def self.run
+    account_name = nil
+  
     OptionParser.new do |opts|
+      opts.banner = "Uberssh"
 
-      opts.banner     = "Uberssh"
-      opts.define_head  "SSH to your uberspace"
+      opts.define_head  "SSH to your Uberspace"
       opts.separator    ""
       opts.separator    "Options:"
 
       opts.on_tail("--help", "Show this message") do
         puts opts
-        puts "\nTo be written...\n\n"
         exit
       end
 
-      opts.on_tail("-a", "--account ACCOUNTNAME", "Specify your account") do |a|
-        options.account = a
+      opts.on_tail("-a", "--account ACCOUNTNAME", "Specify your Uberspace account.") do |name|
+        account_name = name
       end
 
       begin
@@ -32,40 +34,9 @@ module Uberssh
         puts opts
         exit 1
       end
-
-    end
-
-    begin
-
-      if options.account.nil?
-        puts "\n============================================================="
-        puts "            uberssh - ssh to your uberspace"
-        puts "=============================================================\n"
-
-        accounts = []
-        AccountManager.accounts.each_pair do |account, settings|
-          accounts << account
-          puts "[#{accounts.size}] #{settings['project']}"
-        end
-        print "\n--> Please select account: "
-        index = gets.chomp.to_i
-        options.account = accounts[index - 1]
-      end
-
-
-      system "clear"
-      puts "Connecting to #{AccountManager.account(options.account)['project'].upcase}...\n"
-
-      AccountManager.ssh(options.account).each_line do |ssh|
-        puts ssh
-        puts "\n"
-        exec ssh
-      end
-
-    rescue Exception => e
-      puts e.message
     end
 
+    App.new(account_name: account_name).start
   end
 
 end

data/lib/uberssh/account.rb

@@ -0,0 +1,25 @@
+module Uberssh
+
+  class Account
+
+    VALID_OPTIONS = %w( project hostname ssh_key )
+
+    attr_accessor :name, :project, :hostname, :ssh_key
+
+    def initialize(name, options = {})
+      @name = name
+
+      filtered_options(options).each do |k, v|
+        send("#{k}=", v)
+      end
+    end
+
+    private
+
+    def filtered_options(options)
+      options.select { |k, _| VALID_OPTIONS.include?(k) }
+    end
+
+  end
+
+end

data/lib/uberssh/account_manager.rb

@@ -1,26 +1,42 @@
-require 'yaml'
-
 module Uberssh
 
   class AccountManager
 
-    def self.accounts
-      raise "No uberssh configuration found in #{config}" unless File.exist?(config)
-      YAML.load_file(config)['accounts']
+    CONFIG_FILE = Etc.getpwuid.dir. + '/.uberssh'
+
+    def initialize
+      @accounts = []
+    end
+
+    def accounts
+      load_accounts if @accounts.empty?
+
+      @accounts
     end
 
-    def self.ssh(name)
-      a = account(name)
-      raise "Unknown Uberspace account '#{name}'" if a.nil?
-      "ssh -l #{name} #{a['hostname']} -i #{a['ssh-key']}"
+    def account_from_name(name)
+      accounts.detect { |a| a.name == name }
     end
 
-    def self.account(name)
-      accounts[name]
+    def print_accounts
+      accounts.each_with_index do |account, index|
+        puts "[#{index + 1}] #{account.project}"
+      end
     end
 
-    def self.config
-      Etc.getpwuid.dir. + "/.uberssh"
+    private
+
+    def config_file
+      CONFIG_FILE
+    end
+
+    def load_accounts
+      raise "No uberssh configuration found in #{config_file}." unless File.exist?(config_file)
+
+      config = YAML.load_file(config_file)['accounts']
+      config.each_pair do |k ,v|
+        @accounts << Account.new(k, v)  
+      end
     end
 
   end

data/lib/uberssh/app.rb

@@ -0,0 +1,62 @@
+module Uberssh
+
+  class App
+
+    def initialize(account_name: nil)
+      @account_name = account_name
+      @manager      = AccountManager.new
+    end
+
+    def start
+      begin
+        selected_account = nil
+
+        unless @account_name
+          selected_account = select_account
+        else
+          selected_account = @manager.account_from_name(@account_name)
+          raise "The given Uberspace account was not found." unless selected_account
+        end
+
+        system "clear"
+
+        puts "Connecting to #{selected_account.project}..."
+        connect_via_ssh_to(selected_account)
+      rescue Exception => e
+        puts e.message
+      end
+    end
+
+    private
+
+    def select_account
+      print_welcome_message
+      @manager.print_accounts
+      print "\n--> Please select an account: "
+      
+      selected_index   = gets.chomp.to_i
+      selected_account = @manager.accounts[selected_index - 1]
+      raise "The number you gave was not on the list." unless selected_account
+
+      selected_account
+    end
+
+    def print_welcome_message
+      puts "\n============================================================="
+      puts "            uberssh - ssh to your uberspace"
+      puts "=============================================================\n"
+    end
+
+    def connect_via_ssh_to(account)      
+      ssh = ssh_command(account)
+      puts "#{ssh}"
+      exec ssh
+    end
+
+    def ssh_command(account)
+      "ssh -l #{account.name} #{account.hostname} -i #{account.ssh_key}"
+    end
+
+  end
+
+end

data/lib/uberssh/version.rb

@@ -1,3 +1,3 @@
 module Uberssh
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/uberssh.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler",             "~> 1.9"
+  spec.add_dependency "bundler",               "~> 1.9"
 
-  spec.add_development_dependency "rake",    "~> 10.0"
-  spec.add_development_dependency "rspec",   "~> 3"
+  spec.add_development_dependency "rake",      "~> 10.0"
+  spec.add_development_dependency "rspec",     "~> 3"
+  spec.add_development_dependency "rspec-its", "~> 1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uberssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sebastian Oelke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Uberssh is a script that let's you select to which of your uberspaces
   you want to connect to via ssh in just a few key strokes.
 email:
@@ -62,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -70,7 +85,9 @@ files:
 - bin/setup
 - exe/uberssh
 - lib/uberssh.rb
+- lib/uberssh/account.rb
 - lib/uberssh/account_manager.rb
+- lib/uberssh/app.rb
 - lib/uberssh/version.rb
 - uberssh.gemspec
 homepage: https://github.com/baschtl/uberssh.git