vscripts 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f136dbab318d66e5849bc3fd0c919f705f3f4628
-  data.tar.gz: 1a8fc5ec87de153df9422c606b8bcb92e10a1d42
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDkyZjJmNjdiNjYxNzNmYWM1Njc1M2U4OWJhMWIyMDEzMjJiMjVhOQ==
+  data.tar.gz: !binary |-
+    ZTI5MjVkZmUzZmEyMDc4ZjQ3YTE0NWJlNGJlNjcwZjQyYWQ1YzIxMg==
 SHA512:
-  metadata.gz: 6102d72f4aaed7bf46c3bda322ec5f9d8a41b631c402da8572adde1ebde9b0e63ea51bf07971951a2bfc55b9ac7f0b90cb57d14f2a0e6c0375d9b5df25de3b58
-  data.tar.gz: e9d7926d647076d643f8d3f898d990298eb5f268d287335f0dfae69db2703ca3c030f2ba1a05669107355fac20f73e5740d9e5673330702b0159d682873928f6
+  metadata.gz: !binary |-
+    NzZmNjc5NTY3M2IwMzgxYjMxNDM1YWFjZjg0NjkxNmJiYjFjN2EwNDZmNGFk
+    NWZmMjkzNWM5OWMxM2QzZDQ3MTY5ODZiNjQ0NDkxNDVhNzBiMzBlOTdhYTBk
+    YWQ5ZDQ2MjM0ZDU3ZmExNjNkNjBiMzVkYjhlYzU2MDk4OWJmMDI=
+  data.tar.gz: !binary |-
+    MzI0Yzg4M2IwZmM3M2Y4NDdlZGYzMzM3MmQyZTE2YjQ2ZDE4NzI1YmI5NWQw
+    NDczN2Y2ZmRmZTk5YzE4NWJlMDQ5MzlmNmM5YWJjNGJhNzVjNTNkOWVjM2I5
+    ZTNlYjMxODhkZDlmY2E2YmIxZTA5ZWRlYmFmYzIzNWFhYzkxN2M=

data/.travis.yml

@@ -2,4 +2,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.1.2
-script: bundle exec rake spec
+deploy:
+  provider: rubygems
+  api_key:
+    secure: fBDuhk/Ip0Cu/rgBxyKaFsVXkPy21pLqckbKm72n7fN1vDg36r468GPPMPzT85szZOZACpVHVk8L9xZ5aWG0So+n5Swt8S5vjEP4wRU024WCCv0Z1FATT+HwrF3cYxW1PKH/VpFEL0UbAsW+7xpM0q4/nmkLk9FSYmXLahXCGqc=
+  gem: vscripts
+  on:
+    tags: true
+    branch: master

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+Version 0.1.2
+---
+  * Revert "Lock gem versions" ([Vlad - 5881199](https://github.com/vghn/vscripts/commit/5881199dd0dd846667c27a4619c01934c66f2c7b))
+
+Version 0.1.1
+---
+  * Upgrade to RSpec 3 and clean up deprecations ([Vlad Ghinea - c2cf66e](https://github.com/vghn/vscripts/commit/c2cf66efbed7de6e436a74cc4fed46007ef07d5e))
+  * Minor updates ([Vlad Ghinea - e045a5f](https://github.com/vghn/vscripts/commit/e045a5fc6f7cd292d17247af92c580810ed98a26))
+  * Add code coverage ([Vlad Ghinea - 1c0d9dd](https://github.com/vghn/vscripts/commit/1c0d9dddb9ab5cb2090ef1bad84654cc4ab72f28))
+  * Add local code coverage files for development ([Vlad Ghinea - 8a52a9b](https://github.com/vghn/vscripts/commit/8a52a9b800d06374c9ee5ee4872b055af6f9a3be))
+  * Run test by default in Rake ([Vlad Ghinea - 3141ec2](https://github.com/vghn/vscripts/commit/3141ec2e4c5befc8ea83dcdd0198ec7fcc1f06e5))
+  * Fix tags exclude list ([Vlad Ghinea - 98ffe4e](https://github.com/vghn/vscripts/commit/98ffe4e6926be6b91230c31cc7ad64c6cdcfab7d))
+  * Fix file creation ([Vlad - b93cf89](https://github.com/vghn/vscripts/commit/b93cf89b3e35eecc0f52f7399065cab4aeff2377))
+  * More tests ([Vlad - 8e8254c](https://github.com/vghn/vscripts/commit/8e8254c74d1fb667ed5cf672fec256c61762d75d))
+  * Better RSpec ([Vlad - 3c4bd75](https://github.com/vghn/vscripts/commit/3c4bd753de4f324aac29ed1d94fdd1ed3a19b6bc))
+  * Reorganize code and better tests ([Vlad - 11b3029](https://github.com/vghn/vscripts/commit/11b30294c6ced697db6c6f9785d0018a47cb7c5c))
+  * Lock gem versions ([Vlad - 6cb0e58](https://github.com/vghn/vscripts/commit/6cb0e58426cc6b2246b8348652aa89366a43ca7d))
+  * Fix identify command ([Vlad - bc173e7](https://github.com/vghn/vscripts/commit/bc173e7bb7da099beea98fbbe008ce8eaf882e87))
+  * Add RubyGems Deployment ([Vlad - 5e004a0](https://github.com/vghn/vscripts/commit/5e004a0b7d099b2399996672a1e13e9df1b91131))
+  * Delegate RubyGems release to Travis ([Vlad - a2d9178](https://github.com/vghn/vscripts/commit/a2d917857f0e03d36a7fc1281bec1be0f3cc1b98))
+  * Extra space ([Vlad - afbd453](https://github.com/vghn/vscripts/commit/afbd4535e462ccb0c2c4db34d10d224fd2007dc4))
+  * Remove Gemfile.lock ([Vlad - aa8c327](https://github.com/vghn/vscripts/commit/aa8c3278d069e69edc8dbefa468d37afbe0c163f))
+
 Version 0.1.0
 ---
   * Domain fallback to local ([Vlad Ghinea - c0d176f](https://github.com/vghn/vscripts/commit/c0d176fe244c10dd8d2b394075d5d6ef1c0ef332))

data/README.md

@@ -2,6 +2,7 @@
   [![Build Status](https://travis-ci.org/vghn/vscripts.svg?branch=master)](https://travis-ci.org/vghn/vscripts)
   [![Code Climate](https://codeclimate.com/github/vghn/vscripts.png)](https://codeclimate.com/github/vghn/vscripts)
   [![Gem Version](https://badge.fury.io/rb/vscripts.svg)](http://badge.fury.io/rb/vscripts)
+  [![Coverage Status](https://coveralls.io/repos/vghn/vscripts/badge.png)](https://coveralls.io/r/vghn/vscripts)
 
 Automation daemon.
 
@@ -56,7 +57,7 @@ can be overridden by adding `[-a|--all]` command line option.
     $ vscripts tags2facts --file /tmp/my_tags.json --all
     ```
 
-2. **identify**
+2. **Identify**
   This command creates a themed host name and fully qualified domain name for
 the server, using AWS EC2 tags. The default theme is `Group-Role-#` which means
 that the command collects the value of the `Group` and the `Role` AWS EC2 tags
@@ -72,6 +73,7 @@ associated with the current instance.
 
     If a ***--host*** argument is provided it will override the default theme.
     *DOMAIN* is still looked up.
+
     If a ***--domain*** argument is provided it will override the default
     domain.
 

data/Rakefile

@@ -14,6 +14,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
 # Default task
-task :default do
-  puts `rake -T`
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/vscripts.rb

@@ -1,4 +1,4 @@
-require 'vscripts/command'
+require 'vscripts/commands'
 require 'vscripts/command_line'
 
 # Main VScripts module

data/lib/vscripts/aws.rb

@@ -2,9 +2,14 @@ require 'aws-sdk'
 require 'logger'
 require 'yaml'
 
+require 'vscripts/aws/ec2'
+require 'vscripts/aws/metadata'
+
 module VScripts
   # Amazon Web Services Module
   module AWS
     ::AWS.config
+    include VScripts::AWS::EC2
+    include VScripts::AWS::Metadata
   end # module AWS
 end # module VScripts

data/lib/vscripts/aws/ec2.rb

@@ -1,23 +1,16 @@
-require 'vscripts/aws'
-require 'vscripts/aws/metadata'
-
 module VScripts
   module AWS
-    # EC2 Class smells of :reek:UncommunicativeModuleName
+    # EC2 Module smells of :reek:UncommunicativeModuleName
     # @ec2 smells of :reek:UncommunicativeVariableName
+    # ec2 smells of :reek:UncommunicativeMethodName
 
     # AWS Elastic Compute Cloud
-    class EC2
-      include VScripts::AWS::Metadata
-
+    module EC2
       # Load AWS SDK for EC2
-      def initialize
-        @ec2 ||= ::AWS::EC2.new(region: region)
+      def ec2
+        ::AWS::EC2.new(region: region)
       end
 
-      # @return [AWS::EC2]
-      attr_reader :ec2
-
       # Get instance object
       def instance
         check_instance
@@ -41,9 +34,11 @@ module VScripts
 
       # Get a list of tags
       def tags_without(list = [])
-        all = all_tags
-        list.each { |excluded| all.delete(excluded) }
-        all
+        all_tags.each_with_object({}) do |tag, hash|
+          key, value = tag[0], tag[1]
+          hash[key] = value unless list.include? key
+          hash
+        end
       end
 
       # Looks for the value of the 'Name' tag for the given instance
@@ -73,6 +68,6 @@ module VScripts
           functional_instance.tags['Name']
         end
       end
-    end # class EC2
+    end # module EC2
   end # module Amazon
 end # module VScripts

data/lib/vscripts/command_line.rb

@@ -1,6 +1,6 @@
 require 'trollop'
 require 'vscripts/version'
-require 'vscripts/command'
+require 'vscripts/commands'
 
 module VScripts
   # Global Command Line
@@ -23,7 +23,7 @@ module VScripts
     # This method smells of :reek:NestedIterators but ignores them
     # This method smells of :reek:TooManyStatements but ignores them
     def parser # rubocop:disable MethodLength
-      available = Command.list.map { |cmd| cmd.to_s.downcase }
+      available = Commands.list.map { |cmd| cmd.to_s.downcase }
       @parser ||= Trollop::Parser.new do
         version VScripts::VERSION_C
         banner <<-EOS
@@ -57,7 +57,7 @@ EOS
     def verify_command
       command_cli = arguments.shift
       command_cls = command_cli.capitalize.to_sym
-      if Command.list.include?(command_cls)
+      if Commands.list.include?(command_cls)
         return command_cls
       else
         abort "Error: Unknown subcommand '#{command_cli}'\nTry --help."

data/lib/vscripts/{command.rb → commands.rb}

@@ -3,7 +3,7 @@ require 'vscripts/commands/identify'
 
 module VScripts
   # Main Command class
-  class Command
+  module Commands
     # Lists the available commands
     # @return [Array]
     def self.list

data/lib/vscripts/commands/identify.rb

@@ -1,15 +1,13 @@
-require 'trollop'
-require 'vscripts/aws/ec2'
-require 'vscripts/util/local_system'
+require 'vscripts/aws'
+require 'vscripts/util'
 
 module VScripts
   # Commands module
   module Commands
-    # @ec2 smells of :reek:UncommunicativeVariableName
-
     # Identify Class
     class Identify # rubocop:disable ClassLength
-      include VScripts::Util::LocalSystem
+      include VScripts::AWS
+      include VScripts::Util
 
       # HELP
       USAGE = <<-EOS
@@ -42,8 +40,6 @@ associated with the current instance.
     Options:
       EOS
 
-      # @return [AWS::EC2] EC2 SDK
-      attr_reader :ec2
       # @return [String] Theme string
       attr_reader :theme
       # @return [String] Host name
@@ -80,12 +76,6 @@ associated with the current instance.
         end
       end
 
-      # Loads AWS::EC2
-      # This method smells of :reek:UncommunicativeMethodName but ignores it
-      def ec2
-        @ec2 ||= VScripts::AWS::EC2.new
-      end
-
       # @return [Array] Splits theme into elements
       def theme_elements
         theme.split('-')
@@ -94,7 +84,7 @@ associated with the current instance.
       # @return [Array] An array of values for each tag specified in the theme
       def map2tags
         theme_elements.map do |element|
-          element == '#' ? element : ec2.tag(element)
+          element == '#' ? element : tag(element)
         end
       end
 
@@ -106,7 +96,7 @@ associated with the current instance.
       # @return [String] The incremented host name
       def incremented_hostname
         number = 1
-        while ec2.similar_instances.include? "#{themed_host_name}.#{domain}"
+        while similar_instances.include? "#{themed_host_name}.#{domain}"
           .sub(/#/, "#{number}")
           number += 1
         end
@@ -121,7 +111,7 @@ associated with the current instance.
       # @return [String] The value of the command line --domain argument, or the
       #   value of the 'Domain' EC2 tag or the local domain name.
       def new_domain
-        domain || ec2.tag('Domain') || local_domain_name
+        domain || tag('Domain') || local_domain_name
       end
 
       # @return [String] The fully qualified domain name
@@ -131,9 +121,9 @@ associated with the current instance.
 
       # Modify the 'Name' tag
       def set_name_tag
-        return if ec2.tag('Name') == new_fqdn
+        return if tag('Name') == new_fqdn
         puts "Setting name tag to \"#{new_fqdn}\"..."
-        ec2.create_tag(ec2.instance, 'Name', value: new_fqdn)
+        create_tag(instance, 'Name', value: new_fqdn)
       end
 
       # Modify the host name

data/lib/vscripts/commands/tags2facts.rb

@@ -1,15 +1,13 @@
-require 'trollop'
-require 'vscripts/aws/ec2'
-require 'vscripts/util/local_system'
+require 'vscripts/aws'
+require 'vscripts/util'
 
 module VScripts
   # Commands module
   module Commands
-    # @ec2 smells of :reek:UncommunicativeVariableName
-
     # Tags2Facts Class
     class Tags2facts
-      include VScripts::Util::LocalSystem
+      include VScripts::AWS
+      include VScripts::Util
 
       # HELP
       USAGE = <<-EOS
@@ -31,8 +29,6 @@ module VScripts
 
       # @return [Array] Command specific arguments
       attr_reader :arguments
-      # @return [AWS::EC2] EC2 SDK
-      attr_reader :ec2
 
       def initialize(argv = [])
         @arguments ||= argv
@@ -49,12 +45,6 @@ module VScripts
         end
       end
 
-      # Loads AWS EC2
-      # This method smells of :reek:UncommunicativeMethodName but ignores it
-      def ec2
-        @ec2 ||= VScripts::AWS::EC2.new
-      end
-
       # Parses command line arguments
       def cli
         @cli ||= Trollop.with_standard_exception_handling parser do
@@ -67,21 +57,13 @@ module VScripts
         cli.all ? [] : %w(Name Domain)
       end
 
-      # @return [Hash] Filtered tags
-      def filtered_tags
-        ec2.tags_without(exclude_list).each_with_object({}) do |tag, hash|
-          hash[tag[0]] = tag[1]
-          hash
-        end
-      end
-
       # @return [JSON] Formatted JSON
       def tags_json
-        tags_hash = filtered_tags
-        if tags_hash.empty?
+        filtered = tags_without(exclude_list)
+        if filtered.empty?
           abort 'No tags were found!'
         else
-          JSON.pretty_generate(tags_hash)
+          JSON.pretty_generate(filtered)
         end
       end
 

data/lib/vscripts/util.rb

@@ -0,0 +1,12 @@
+require 'fileutils'
+require 'yaml'
+require 'English'
+
+require 'vscripts/util/local_system'
+
+module VScripts
+  # Amazon Web Services Module
+  module Util
+    include VScripts::Util::LocalSystem
+  end # module AWS
+end # module VScripts

data/lib/vscripts/util/local_system.rb

@@ -1,7 +1,3 @@
-require 'fileutils'
-require 'yaml'
-require 'English'
-
 module VScripts
   module Util
     # Local system functions library
@@ -60,7 +56,7 @@ module VScripts
           newfile.write(body)
         end
       rescue Errno::EACCES
-        puts "FATAL: You need to be root in order to write to #{file}"
+        abort "FATAL: You need to be root in order to write to #{file}"
       end
 
       # Ensures the specified file has the specified content
@@ -68,30 +64,6 @@ module VScripts
         write = write_file(file, body)
         read  = IO.read(file)
         read == body || write
-      rescue
-        write
-      end
-
-      # Gets system checks from environment variables
-      def checks
-        config['SystemChecks']
-      rescue
-        {}
-      end
-
-      # Runs each command specified and returns the name and exit status
-      def process_checks
-        codes = {}
-        checks.each do |name, command|
-          system("#{command} > /dev/null 2>&1")
-          codes[name] = $CHILD_STATUS.exitstatus
-        end
-        codes
-      end
-
-      # Extract the codes for each check
-      def status_codes
-        process_checks.values.compact
       end
     end # module LocalSystem
   end # module Util

data/spec/aws_spec_helper.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'aws-sdk'
+
+::AWS.config({
+  :access_key_id => '1234',
+  :secret_access_key => '5678',
+  :region => 'us-east-1',
+  :logger => nil,
+  :stub_requests => true
+})

data/spec/spec_helper.rb

@@ -1,2 +1,27 @@
-class DummyClass
-end
+# Track your code coverage
+require 'coveralls'
+Coveralls.wear!
+
+# Development code coverage
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter
+]
+
+# RSpec Configuration
+RSpec.configure {|config|
+  # Abort the run on first failure.
+  config.fail_fast = true
+
+  # Use color in STDOUT
+  config.color = true
+
+  # Use color not only in STDOUT but also in pagers and files
+  config.tty = true
+
+  # Use the specified formatter
+  config.formatter = :documentation # :progress, :html, :textmate
+
+  # Clean up
+  config.after(:suite) { `ls /tmp/vscripts-test-* &> /dev/null && rm -r /tmp/vscripts-test-*` }
+}