fantassh 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a01ad29fdf51e3f06eb32b575bc144458babff7
-  data.tar.gz: df7eb7fa10ad36d6d31d3ae7a3e60a271b4285d8
+  metadata.gz: 3313e2ac142946ca069a6aa41411ffba516b69db
+  data.tar.gz: 6b7ca5d40c94b48c95c0d3c4a588a99397fb41af
 SHA512:
-  metadata.gz: 93607b03fd97dadbcafabcc40ade5a090de21cd8372be11f77f6f01100c7d1d8d71112722ab1c3457dfac825a41902ce5c7ef673cb2197fb86f627540b9438d3
-  data.tar.gz: d055fa3ca230d3dc2e36ebc4def23626821cbfd3dfc8bb4d037505535ede1893b7265e3e1e18897331d4632ec3f7c4ea9667e2d5eb5250f6c021b6f87753acfb
+  metadata.gz: e1a8a47857b20d771656245ddc4db65a7aa1a1b66ce626c1d5359494892b99b3fc6537695db9579efdddac156a5c7ddf8076dc575c5309335caf6b08aeaa0fbe
+  data.tar.gz: a404aacc74a19a34c2ca713e515353543f03af7cc503716f2cbb985fd3f82d2a8bcf1c0fcc9427e0e710c8e3977d98280fbeb0f513cb6a7a1b2bc01cb894cdbf

data/bin/fantassh

@@ -2,4 +2,4 @@
 
 require 'fantassh'
 
-Fantassh::Application.new.run
+Fantassh::Application.run

data/fantassh.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'slop'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/fantassh/application.rb

@@ -1,17 +1,59 @@
+require 'slop'
 require_relative 'bash_history'
 require_relative 'entries'
 
 module Fantassh
   class Application
-    def initialize
-      @entries = Entries.new
-      @bash_history = BashHistory.new
-    end
+    class << self
+      def run(argv = ARGV)
+        Slop.parse(argv, help: true) do
+          on '-v', '--version', 'Print the program version.' do
+            puts "#{File.basename($0)} v#{Fantassh::VERSION}"
+            exit
+          end
+
+          # default, runs when called without arguments
+          run do
+            Fantassh::Application.list
+          end
+
+          command :exclude do
+            banner "Usage: #{File.basename($0)} exclude <ssh command>"
+
+            run do |opts, args|
+              if args.empty?
+                puts help
+                exit
+              end
+
+              Fantassh::Application.exclude(args.join(' '))
+            end
+          end
+        end
+      end
+
+      def list
+        entries.add(bash_history.entries)
+
+        selected_entry = `echo '#{entries.all.join("\n")}' | selecta`
+        # in case selecta receives ctrl+c we don't proceed
+        unless selected_entry.empty?
+          # indent by whitespace so it doesn't show up in the history
+          exec " ssh #{selected_entry}"
+        end
+      end
+
+      def exclude(entry)
+        entries.exclude([entry])
+      end
+
+      def entries
+        Entries.new
+      end
 
-    def run
-      @entries.add(@bash_history.entries)
-      # indent by whitespace so it doesn't show up in the history
-      exec " ssh $(cat #{@entries.entries_file} | selecta)"
+      def bash_history
+        BashHistory.new
+      end
     end
   end
 end

data/lib/fantassh/bash_history.rb

@@ -2,7 +2,7 @@ module Fantassh
   class BashHistory
     def entries
       File.readlines(File.join(Dir.home, '.bash_history')).
-        grep(/^\s*ssh/).
+        grep(/^\s*ssh\s/).
         map(&:strip).
         uniq.
         map { |x| x.gsub(/^ssh\s+/, '') }

data/lib/fantassh/entries.rb

@@ -1,39 +1,30 @@
-require 'fileutils'
+require_relative 'entries_file'
+require_relative 'excluded_entries_file'
 
 module Fantassh
   class Entries
-    attr_reader :entries_file
+    def initialize(entries_file: EntriesFile.new, excluded_entries_file: ExcludedEntriesFile.new)
+      @entries_file = entries_file
+      @excluded_entries_file = excluded_entries_file
 
-    def initialize(config_dir: nil)
-      @config_dir = config_dir || File.join(Dir.home, '.fantassh')
-      @entries_file = File.join(@config_dir, 'entries')
-      @excluded_entries_file = File.join(@config_dir, 'excluded_entries')
       init_file_structure
     end
 
-    def all
-      File.readlines(@entries_file).map(&:strip)
+    def add(entries)
+      @entries_file.add(entries)
     end
 
-    def excluded
-      File.readlines(@excluded_entries_file).map(&:strip)
+    def all
+      @entries_file.all - @excluded_entries_file.all
     end
 
-    def add(new_entries)
-      new_entries = new_entries.map(&:strip).delete_if { |x| x.empty? }
-      entries = (all + new_entries).uniq - excluded
-
-      File.open(@entries_file, 'w') do |f|
-        f.puts(entries)
-      end
+    def exclude(entries)
+      @excluded_entries_file.add(entries)
     end
 
     def init_file_structure
-      unless Dir.exist?(@config_dir)
-        FileUtils.mkdir(@config_dir)
-      end
-      FileUtils.touch(@entries_file)
-      FileUtils.touch(@excluded_entries_file)
+      @entries_file.init_file_structure
+      @excluded_entries_file.init_file_structure
     end
   end
 end

data/lib/fantassh/entries_file.rb

@@ -0,0 +1,33 @@
+require 'fileutils'
+
+module Fantassh
+  class EntriesFile
+    def initialize(config_dir: nil)
+      @config_dir = config_dir || File.join(Dir.home, '.fantassh')
+    end
+
+    def all
+      File.readlines(file).map(&:strip)
+    end
+
+    def add(new_entries)
+      new_entries = new_entries.map(&:strip).delete_if { |x| x.empty? }
+      entries = (all + new_entries).uniq
+
+      File.open(file, 'w') do |f|
+        f.puts(entries)
+      end
+    end
+
+    def file
+      File.join(@config_dir, 'entries')
+    end
+
+    def init_file_structure
+      unless Dir.exist?(@config_dir)
+        FileUtils.mkdir(@config_dir)
+      end
+      FileUtils.touch(file)
+    end
+  end
+end

data/lib/fantassh/excluded_entries_file.rb

@@ -0,0 +1,10 @@
+require 'fileutils'
+require_relative 'entries_file'
+
+module Fantassh
+  class ExcludedEntriesFile < EntriesFile
+    def file
+      File.join(@config_dir, 'excluded_entries')
+    end
+  end
+end

data/lib/fantassh/version.rb

@@ -1,3 +1,3 @@
 module Fantassh
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/lib/application_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'tmpdir'
+
+module Fantassh
+  describe Application do
+    context 'exclude' do
+      it 'adds an entry to the excluded entries' do
+        Dir.mktmpdir do |dir|
+          entries_file = Entries.new(
+            entries_file: EntriesFile.new(config_dir: dir),
+            excluded_entries_file: ExcludedEntriesFile.new(config_dir: dir))
+          Application.stub(entries: entries_file)
+
+          Application.run(['exclude', 'ssh bogus'])
+
+          File.readlines(File.join(dir, 'excluded_entries')).should == ["ssh bogus\n"]
+        end
+      end
+    end
+  end
+end

data/spec/lib/bash_history_spec.rb

@@ -6,12 +6,19 @@ module Fantassh
     subject { BashHistory.new }
 
     context "#entries" do
-      it "returns entries that start with 'ssh'" do
+      it "returns entries that start with 'ssh '" do
         File.stub(readlines: ["ssh host1.com\n", "host2.com\n", "\n"])
 
         subject.entries.should == ['host1.com']
       end
 
+      it "doesn't return entries that start with 'ssh*'" do
+        File.stub(readlines: ["ssh host1.com\n",
+                              "ssh-keygen -t rsa -C 'a@a.com'\n", "\n"])
+
+        subject.entries.should == ['host1.com']
+      end
+
       it "ignores duplicates" do
         File.stub(readlines: ["ssh host1.com\n", "ssh host1.com\n"])
 

data/spec/lib/entries_file_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'fantassh/entries_file'
+
+module Fantassh
+  describe EntriesFile do
+    subject { EntriesFile.new(config_dir: '/dir') }
+
+    context "#all" do
+      it "returns all entries" do
+        File.should_receive(:readlines).with('/dir/entries').
+          and_return(["host1.com\n", "user@host2.com\n"])
+
+        subject.all.should == ['host1.com', 'user@host2.com']
+      end
+    end
+
+    context "#add" do
+      before do
+        file = double('file')
+        File.should_receive(:open).with('/dir/entries', 'w').and_yield(file)
+        file.should_receive(:puts).with(["host1.com"])
+      end
+
+      it "adds a new entry" do
+        subject.stub(all: [])
+        subject.stub(excluded: [])
+
+        subject.add(["host1.com"])
+      end
+
+      it "doesn't add a duplicate" do
+        subject.stub(all: ["host1.com"])
+        subject.stub(excluded: [])
+
+        subject.add(["host1.com"])
+      end
+
+      it "doesn't add an empty entry" do
+        subject.stub(all: ["host1.com"])
+        subject.stub(excluded: [])
+
+        subject.add([''])
+      end
+
+      it "removes leading and trailing whitespace" do
+        subject.stub(all: [])
+        subject.stub(excluded: [])
+
+        subject.add(["  host1.com\n\n"])
+      end
+    end
+  end
+end

data/spec/lib/entries_spec.rb

@@ -3,66 +3,35 @@ require 'fantassh/entries'
 
 module Fantassh
   describe Entries do
-    before { Entries.any_instance.stub(:init_file_structure) }
-    subject { Entries.new(config_dir: '/dir') }
+    let(:entries_file) { double(:entries_file) }
 
-    context "#excluded" do
-      it "returns the hidden entries" do
-        File.should_receive(:readlines).and_return(["host1.com\n"])
+    let(:excluded_entries_file) { double(:excluded_entries_file) }
 
-        subject.excluded.should == ['host1.com']
-      end
-    end
-
-    context "#all" do
-      it "returns all entries" do
-        File.should_receive(:readlines).with('/dir/entries').
-          and_return(["host1.com\n", "user@host2.com\n"])
+    context "#initialize" do
+      it "calls init_file_structure on both entry files" do
+        entries_file.should_receive(:init_file_structure)
+        excluded_entries_file.should_receive(:init_file_structure)
 
-        subject.all.should == ['host1.com', 'user@host2.com']
+        Entries.new(entries_file: entries_file, excluded_entries_file: excluded_entries_file)
       end
     end
 
-    context "#add" do
-      before do
-        file = double('file')
-        File.should_receive(:open).with('/dir/entries', 'w').and_yield(file)
-        file.should_receive(:puts).with(["host1.com"])
-      end
-
-      it "adds a new entry" do
-        subject.stub(all: [])
-        subject.stub(excluded: [])
-
-        subject.add(["host1.com"])
-      end
-
-      it "doesn't add a duplicate" do
-        subject.stub(all: ["host1.com"])
-        subject.stub(excluded: [])
-
-        subject.add(["host1.com"])
-      end
-
-      it "doesn't add a hidden entry" do
-        subject.stub(all: ["host1.com"])
-        subject.stub(excluded: ["user@host2.com"])
-
-        subject.add(["user@host2.com"])
-      end
+    context "#all" do
+      before { Entries.any_instance.stub(:init_file_structure) }
 
-      it "doesn't add an empty entry" do
-        subject.stub(all: ["host1.com"])
-        subject.stub(excluded: [])
+      it "returns an entry" do
+        entries_file.should_receive(:all).and_return(["host1.com"])
 
-        subject.add([''])
+        Entries.new(entries_file: entries_file).all.should ==
+          ["host1.com"]
       end
 
-      it "removes leading and trailing whitespace" do
-        subject.stub(all: [])
-        subject.stub(excluded: [])
+      it "doesn't return a hidden entry" do
+        entries_file.should_receive(:all).and_return(["host1.com"])
+        excluded_entries_file.should_receive(:all).and_return(["user@host2.com"])
 
-        subject.add(["  host1.com\n\n"])
+        Entries.new(entries_file: entries_file, excluded_entries_file: excluded_entries_file).
+          all.should == ["host1.com"]
       end
     end
   end

data/spec/lib/excluded_entries_file_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'fantassh/excluded_entries_file'
+
+module Fantassh
+  describe ExcludedEntriesFile do
+    subject { ExcludedEntriesFile.new(config_dir: '/dir') }
+
+    context "#all" do
+      it "returns all entries" do
+        File.should_receive(:readlines).with('/dir/excluded_entries').
+          and_return(["user@host2.com\n"])
+
+        subject.all.should == ['user@host2.com']
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fantassh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexis Reigel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,9 +86,14 @@ files:
 - lib/fantassh/application.rb
 - lib/fantassh/bash_history.rb
 - lib/fantassh/entries.rb
+- lib/fantassh/entries_file.rb
+- lib/fantassh/excluded_entries_file.rb
 - lib/fantassh/version.rb
+- spec/lib/application_spec.rb
 - spec/lib/bash_history_spec.rb
+- spec/lib/entries_file_spec.rb
 - spec/lib/entries_spec.rb
+- spec/lib/excluded_entries_file_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/koffeinfrei/fantassh
 licenses:
@@ -101,6 +120,9 @@ signing_key:
 specification_version: 4
 summary: Provides a selectable history list for quickly accessing your past ssh connections.
 test_files:
+- spec/lib/application_spec.rb
 - spec/lib/bash_history_spec.rb
+- spec/lib/entries_file_spec.rb
 - spec/lib/entries_spec.rb
+- spec/lib/excluded_entries_file_spec.rb
 - spec/spec_helper.rb