erforscher 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec74a3e7f15636cc457795d15f7f4bb4407d849a
-  data.tar.gz: e91330cd59d4dd4d8e52055f65590074b207227a
+  metadata.gz: cce5c98468b9a337ecb4b9eff30866bb0f24ad2a
+  data.tar.gz: 797747affc4a602020e7d5fbcb61cd7358c09c23
 SHA512:
-  metadata.gz: e8558702da92aebe8b5cfce3182695662e630cbc6c7d02d62d5e19365c4240b2f08d1e47037d947f465f3461ceac040e9658c5126e62ee075339095dbbd608ee
-  data.tar.gz: a6689f5c8736b24ef99e4756df726c0ecc57292043a58e338dae40a2dbe213dec7e0e84c645d42fcaa53fdbf3db0c32ccab804dc5cbcbecf585036b10800ccea
+  metadata.gz: bb4008443850b614d681db4a8746221afd39462810b099445fd80eafd046cfc94fc1c8e0a3617b542e093422c21dda150bb9548f35da3cf4b3d10632db49acb5
+  data.tar.gz: ce000ac689f404e9129035f3b2f81be9de7e9c651384a54cf74483d85cd135133d31a435b65ba662f6812b4abcf37036df74ebbf4b25414dcf09caa588296e26

data/README.md

@@ -1,6 +1,7 @@
 # Erforscher
 
 [![Build Status](https://travis-ci.org/mthssdrbrg/erforscher.svg?branch=master)](https://travis-ci.org/mthssdrbrg/erforscher)
+[![Gem Version](https://badge.fury.io/rb/erforscher.svg)](http://badge.fury.io/rb/erforscher)
 
 Erforscher, German for "explorer", is a poor man's service discovery tool that
 utilizes the AWS EC2 APIs to filter instances from a configured set of `tags`
@@ -31,7 +32,8 @@ the near future.
 ## Usage
 
 ```bash
-erforscher --help
+erforscher -h|--help
+erforscher -v|--version
 erforscher -T|--tags <K1=V1,K2=V2>
 erforscher -N|--name <TAG>
 erforscher -c|--config <PATH>

data/lib/erforscher.rb

@@ -18,3 +18,4 @@ require 'erforscher/formatter'
 require 'erforscher/hostsfile'
 require 'erforscher/instances'
 require 'erforscher/runner'
+require 'erforscher/version'

data/lib/erforscher/cli.rb

@@ -11,10 +11,12 @@ module Erforscher
       if config['print_usage']
         io.puts(@parser)
         2
+      elsif config['print_version']
+        io.puts(%(erforscher v#{Erforscher::VERSION}))
       else
         Runner.run(config)
-        0
       end
+      0
     rescue => e
       io.puts(%(#{e.message} (#{e.class.name})))
       io.puts(@parser)
@@ -37,6 +39,10 @@ module Erforscher
           cli['name_tag'] = name_tag
         end
 
+        parser.on('-v', '--version', 'Display current version') do
+          cli['print_version'] = true
+        end
+
         parser.on('-h', '--help', 'You\'re looking at it') do
           cli['print_usage'] = true
         end

data/lib/erforscher/formatter.rb

@@ -23,7 +23,7 @@ module Erforscher
 
     def find_name(tags)
       tag = tags.find { |tag| tag[:key] == @name_tag }
-      tag.value if tag
+      tag[:value] if tag
     end
 
     def strip_domain(name)

data/lib/erforscher/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Erforscher
-  VERSION = '1.0.0.pre1'.freeze
+  VERSION = '1.0.0.pre2'.freeze
 end

data/spec/acceptance/cli_spec.rb

@@ -49,20 +49,22 @@ describe 'bin/erforscher' do
   end
 
   after do
+    hostsfile.close
     hostsfile.delete
+    config_file.close
     config_file.delete
   end
 
   context 'when given --help or -h' do
-    it 'returns 2 and prints usage' do
+    it 'returns 0 and prints usage' do
       code = Erforscher::Cli.run(%w[-h], io)
-      expect(code).to eq(2)
+      expect(code).to eq(0)
       expect(io.string).to include 'Usage:'
 
       io.rewind
 
       code = Erforscher::Cli.run(%w[--help], io)
-      expect(code).to eq(2)
+      expect(code).to eq(0)
       expect(io.string).to include 'Usage:'
     end
   end
@@ -138,4 +140,18 @@ describe 'bin/erforscher' do
       expect(new_hostsfile).to include("instance-004\t10.0.0.4")
     end
   end
+
+  context 'when given -v or --version' do
+    it 'returns 0 and prints current version' do
+      code = Erforscher::Cli.run(%w[-v], io)
+      expect(code).to eq(0)
+      expect(io.string).to match(/^erforscher v\d+\.\d+\.\d+/)
+
+      io.rewind
+
+      code = Erforscher::Cli.run(%w[--version], io)
+      expect(code).to eq(0)
+      expect(io.string).to match(/^erforscher v\d+\.\d+\.\d+/)
+    end
+  end
 end

data/spec/erforscher/formatter_spec.rb

@@ -15,7 +15,7 @@ module Erforscher
     let :instance do
       OpenStruct.new({
         tags: [
-          OpenStruct.new({key: 'Name', value: 'hello-world-001.domain.com'})
+          {key: 'Name', value: 'hello-world-001.domain.com'}
         ],
         private_ip_address: '10.0.0.1',
         private_dns_name: 'private-dns-name',

data/spec/support/fake_ec2.rb

@@ -2,12 +2,7 @@
 
 class FakeEc2
   def initialize(instances)
-    @instances = instances.map do |instance|
-      tags = instance.delete(:tags)
-      tags = tags.map { |tag| OpenStruct.new(tag) }
-      instance[:tags] = tags
-      OpenStruct.new(instance)
-    end
+    @instances = instances.map { |instance| OpenStruct.new(instance) }
   end
 
   def describe_instances(opts={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erforscher
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Mathias Söderberg
@@ -61,9 +61,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"