erforscher 1.0.0.pre0 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81b9781cb741624366f9c8dfa9bf16aea4732ad
-  data.tar.gz: dadbf7c5d3ff00598569d819ccb9ec119ca566e5
+  metadata.gz: ec74a3e7f15636cc457795d15f7f4bb4407d849a
+  data.tar.gz: e91330cd59d4dd4d8e52055f65590074b207227a
 SHA512:
-  metadata.gz: cd64bb14f561e9407d536c35f1891f12d9f1b23defd37f6286c8b9e14076a4904cf995a84d216dbb644cf19044ff55d59b77c0416dad22d6354d6018d44b3d3a
-  data.tar.gz: 2e5a3a567b4f3352f6ce2e8a61eb69f2111008790c6bb594209588c323c11e9eb77657a0d03d62ac9517553f7efe1392a9aa791b5b3b8ebd1828d0daa7cfafc7
+  metadata.gz: e8558702da92aebe8b5cfce3182695662e630cbc6c7d02d62d5e19365c4240b2f08d1e47037d947f465f3461ceac040e9658c5126e62ee075339095dbbd608ee
+  data.tar.gz: a6689f5c8736b24ef99e4756df726c0ecc57292043a58e338dae40a2dbe213dec7e0e84c645d42fcaa53fdbf3db0c32ccab804dc5cbcbecf585036b10800ccea

data/README.md

@@ -1,15 +1,17 @@
 # Erforscher
 
-Erforscher is a poor man's service discovery tool that uses the AWS EC2 APIs to
-(optionally) filter instance from a configured set of `tags` and writes
-hostnames (derived from a configured `name` tag) and private IP address mappings
-to `/etc/hosts` (or any file of your choosing).
+[![Build Status](https://travis-ci.org/mthssdrbrg/erforscher.svg?branch=master)](https://travis-ci.org/mthssdrbrg/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`
+and writes hostnames (derived from a configured `name` tag) and private IP address
+mappings to `/etc/hosts` (or any file of your choosing).
 
 By default, Erforscher will look for a configuration file in the following
 places (and in the given order);
 
-* $HOME/.erforscher.yml
-* /etc/erforscher.yml
+* `$HOME/.erforscher.yml`
+* `/etc/erforscher.yml`
 
 As indicated below it's also possible to give the path to a configuration file
 using the `-c|--config` option, and in that case the given path will be used.
@@ -19,8 +21,12 @@ to merge settings if there should be files in the above mentioned places.
 
 ## Installation
 
-No, not currently, but it will be available as a `gem` and as `omnibus`
-packages, whenever it's ready for releasing out into the wild.
+```
+gem install erforscher --pre
+```
+
+It will be available as `omnibus` packages and most likely a `Chef` cookbook in
+the near future.
 
 ## Usage
 
@@ -42,3 +48,19 @@ tags:
   - environment: 'production'
     service: 'database'
 ```
+
+## Copyright
+
+Copyright :: 2014 Mathias Söderberg
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/erforscher/cli.rb

@@ -13,6 +13,7 @@ module Erforscher
         2
       else
         Runner.run(config)
+        0
       end
     rescue => e
       io.puts(%(#{e.message} (#{e.class.name})))

data/lib/erforscher/hostsfile.rb

@@ -16,26 +16,30 @@ module Erforscher
       write_footer
       discard_old_entries
       copy_after_footer
+      nil
     end
 
-    def switchero
+    def switch
       @new_file.close
+      @current_file.close
       @fileutils.mv(current_path, current_prev_path)
       @fileutils.mv(new_path, current_path)
+      @fileutils.chmod(0644, current_path)
+      nil
     end
 
     private
 
     def new_path
-      @new_file.path
+      @new_path ||= @new_file.path
     end
 
     def current_path
-      absolute_path(@current_file)
+      @current_path ||= absolute_path(@current_file)
     end
 
     def current_prev_path
-      %(#{absolute_path(@current_file)}.prev)
+      @current_prev_path ||= %(#{absolute_path(@current_file)}.prev)
     end
 
     def absolute_path(f)

data/lib/erforscher/runner.rb

@@ -12,9 +12,9 @@ module Erforscher
 
     def run
       explored = explorer.discover(@config['tags'])
-      entries = explored.sort.map { |ex| formatter.format(ex) }
-      hostsfile.write(entries)
-      hostsfile.switchero
+      entries = explored.map { |ex| formatter.format(ex) }
+      hostsfile.write(entries.sort)
+      hostsfile.switch
     end
 
     private

data/lib/erforscher/version.rb

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

data/spec/erforscher/hostsfile_spec.rb

@@ -100,7 +100,7 @@ module Erforscher
       end
     end
 
-    describe '#switchero' do
+    describe '#switch' do
       let :new_file do
         Tempfile.new('new_file')
       end
@@ -118,13 +118,17 @@ module Erforscher
       end
 
       before do
-        hostsfile.switchero
+        hostsfile.switch
       end
 
       it 'closes the new file' do
         new_file.should be_closed
       end
 
+      it 'closes the old file' do
+        current_file.should be_closed
+      end
+
       it 'backups the previous file' do
         fileutils.should have_received(:mv).with(absolute_current_path, %(#{absolute_current_path}.prev))
       end
@@ -132,6 +136,10 @@ module Erforscher
       it 'renames the new file' do
         fileutils.should have_received(:mv).with(absolute_new_path, absolute_current_path)
       end
+
+      it 'applies 0644 permissions on the new file' do
+        fileutils.should have_received(:chmod).with(0644, absolute_current_path)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erforscher
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre0
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Mathias Söderberg