specs 0.19 → 0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc8fbd20c9643c2b14cc197206902202f3960f8
-  data.tar.gz: e2e9d12b0723079cb32a3db43bc80d5bbbd51993
+  metadata.gz: 108f0346813810751bc678547295cef5d746de69
+  data.tar.gz: fb0540346c63920763af7f363c535288e06598ed
 SHA512:
-  metadata.gz: f0e1c9c089361b1cf962edc5c3b07cfe9c13c1da7f1e8ac29604a15839f22e461ac39a04bf27e4ebaeeb012cbd9c012745324c99c4c7fd2ff9e8832dcc195024
-  data.tar.gz: 30b0b545cf2852c285f4b6eabe85a9760594283607166d75cc50ced13b1c3f68d38f39bb7b49273d0a7d46d72b135ea8f6b0182827677edf28db0b4487b74b56
+  metadata.gz: 98c054f85195eb660291294399f24e2da4d7afb9fd5717d6fbd7b02918cb632925132c7fd0c59ef5e87ebcb1c5d7f0d00faa1539474ca49b3ebcf97617385704
+  data.tar.gz: 7f40300e49dbcfa0eba415c23768d62095df8589f0a8ca70858f2180ea889d4d390eeee2ef2b0736f539121fa8b6f274ebb641ad70304cd232601b398fe492e2

data/bin/specs

@@ -1,9 +1,3 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'specs'
-
-begin
-  main
-rescue Interrupt
-  nil
-end
+Specs::main

data/lib/aspects/memcached.rb

@@ -0,0 +1,5 @@
+module Recipe
+  def self.memcached
+    'echo version | nc localhost 11211'
+  end
+end

data/lib/cli.rb

@@ -0,0 +1,52 @@
+require_relative 'specs'
+
+require 'docopt'
+
+USAGE = <<DOCOPT
+Usage:
+  specs [-v | -h] [<aspect>]...
+
+Arguments:
+  <aspect>  Software stack to query [default: os hardware].
+
+Options:
+  -v --version  Print version info.
+  -h --help     Print usage info.
+DOCOPT
+
+module Specs
+  def self.main
+    check_ruby_version
+
+    begin
+      options = Docopt::docopt(USAGE, version: Specs::VERSION)
+
+      aspects = options['<aspect>']
+
+      # Work around https://github.com/docopt/docopt/issues/274
+      if aspects == []
+        aspects = ['os', 'hardware']
+      end
+
+      # Print specs' own version, and filter out redundant requests
+      aspects = ['specs'] + (aspects - ['specs'])
+
+      aspects.each do |aspect|
+        # What does the aspect module say to run
+        # in order to retrieve the aspect information?
+        cmds = command(aspect)
+
+        if !cmds || cmds.instance_of?(String)
+          run(cmds, aspect)
+        # Module returns an array of command strings.
+        elsif cmds.instance_of?(Array)
+          cmds.each { |cmd| run(cmd, aspect) }
+        end
+      end
+    rescue Docopt::Exit => e
+      puts e.message
+    end
+  rescue Interrupt
+    nil
+  end
+end

data/lib/specs.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 #
 # Author:: Andrew Pennebaker
 #
@@ -8,16 +7,6 @@
 #
 # specs - Get system specs easily
 #
-# == Usage
-#
-# specs [aspects]
-#
-# Example:
-#
-# specs ruby os hardware
-#
-# By default, aspects are os and hardware.
-#
 # If an aspect is not installed, its output may be omitted.
 #
 # --help, -h:
@@ -26,18 +15,14 @@
 # --version, -v:
 #    print specs' own version
 
-require 'getoptlong'
 require 'pathname'
 require 'system_with_aliases'
 require 'contracts'
 include Contracts
 
 require_relative 'version'
-SPECS_VERSION_STRING = "specs #{Specs::VERSION}"
-
-SPECS_HOME_PAGE = 'https://github.com/mcandre/specs#readme'
 
-SPECS_DIR = Pathname.new(File.dirname(__FILE__))
+require_relative 'cli'
 
 # Get the basic operating system name reliably, even in JRuby
 # Useful for OS-contextual command line instructions.
@@ -160,11 +145,6 @@ module Recipe
     "ruby -rrbconfig -e \"puts RbConfig::CONFIG['arch']\""
   end
 
-  Contract nil => String
-  def self.specs
-    SPECS_VERSION_STRING
-  end
-
   Contract nil => String
   def self.ruby_v
     RUBY_VERSION
@@ -201,104 +181,78 @@ module Recipe
   end
 end
 
-BUILTINS = %w(specs os arch ruby)
-
-SEP = File::SEPARATOR
+module Specs
+  include Contracts::Modules
 
-# .../specs/aspects
-RECIPE_DIR = [SPECS_DIR, 'aspects'].join(SEP)
+  SPECS_DIR = Pathname.new(File.dirname(__FILE__))
 
-Dir[File.join(RECIPE_DIR, '**', '*.rb')].each do |file|
-  require File.expand_path(file)
-end
+  BUILTINS = %w(specs os arch ruby)
 
-# For a given spec, return the command line instruction(s)
-# that will get the spec's version information.
-Contract String => Any
-def self.command(aspect)
-  # Ruby methods can't use hyphens (-),
-  # So translate to underscores (_)
-  # When looking up known aspects.
-  method = aspect.gsub('-', '_').to_sym
-
-  # Package?
-  if aspect.include?(':')
-    package_manager, package = aspect.split(':')
-    package_manager = package_manager.to_sym
-
-    if Recipe::Package.methods.include?(package_manager)
-      Recipe::Package.send(package_manager, package)
-    end
-  # Known aspect?
-  elsif Recipe.methods.include?(method)
-    Recipe.send(method)
-  # Unknown aspect.
-  # Default to --version flag.
-  else
-    "#{aspect} --version"
-  end
-end
+  SEP = File::SEPARATOR
 
-# Print a command line instruction and its output,
-# Emulating a user manually entering the instruction.
-def self.run(cmd, aspect)
-  # Newline to visually separate multiple aspect commands.
-  puts ''
+  # .../specs/aspects
+  RECIPE_DIR = [SPECS_DIR, 'aspects'].join(SEP)
 
-  if !cmd
-    puts "#{aspect} aspect not implemented for this system"
-  elsif cmd == SPECS_VERSION_STRING
-    puts 'specs --version'
-    puts SPECS_VERSION_STRING
-  else
-    puts cmd
-
-    output = SystemWithAliases::execute(cmd)
+  Dir[File.join(RECIPE_DIR, '**', '*.rb')].each do |file|
+    require File.expand_path(file)
+  end
 
-    if output.include?(Recipe.command_not_found)
-      puts "#{cmd.split.first} not found"
+  # For a given spec, return the command line instruction(s)
+  # that will get the spec's version information.
+  Contract String => Any
+  def self.command(aspect)
+    # Ruby methods can't use hyphens (-),
+    # So translate to underscores (_)
+    # When looking up known aspects.
+    method = aspect.gsub('-', '_').to_sym
+
+    # Package?
+    if aspect.include?(':')
+      package_manager, package = aspect.split(':')
+      package_manager = package_manager.to_sym
+
+      if Recipe::Package.methods.include?(package_manager)
+        Recipe::Package.send(package_manager, package)
+      end
+    # Known aspect?
+    elsif Recipe.methods.include?(method)
+      Recipe.send(method)
+    # Unknown aspect.
+    # Default to --version flag.
     else
-      puts output
+      "#{aspect} --version"
     end
   end
-end
-
-def self.check_ruby_version
-  if Recipe.ruby1_8?
-    puts 'Requires Ruby 1.9 or higher.'
-    puts 'http://www.ruby-lang.org/'
-    exit
-  end
-end
-
-def self.usage
-  puts "Specs:\n\n#{SPECS_VERSION_STRING}\n#{SPECS_HOME_PAGE}"
 
-  exit if ARGV.include?('--version')
-end
-
-def main
-  check_ruby_version
-
-  usage
-
-  # Default aspects
-  aspects = %w(os) # hardware)
+  # Print a command line instruction and its output,
+  # Emulating a user manually entering the instruction.
+  def self.run(cmd, aspect)
+    if !cmd
+      puts "#{aspect} aspect not implemented for this system"
+    elsif cmd == 'specs'
+      puts 'specs --version'
+      puts Specs::Version
+    else
+      puts cmd
 
-  aspects = ARGV unless ARGV.empty?
+      output = SystemWithAliases::execute(cmd)
 
-  aspects -= ['specs', '-v', 'version', '-version', '--version']
+      if output.include?(Recipe.command_not_found)
+        puts "#{cmd.split.first} not found"
+      else
+        puts output
+      end
 
-  aspects.each do |aspect|
-    # What does the aspect module say to run
-    # in order to retrieve the aspect information?
-    cmds = command(aspect)
+      # Vertically separate multiple aspects
+      puts ''
+    end
+  end
 
-    if !cmds || cmds.instance_of?(String)
-      run(cmds, aspect)
-      # Module returns an array of command strings.
-    elsif cmds.instance_of?(Array)
-      cmds.each { |cmd| run(cmd, aspect) }
+  def self.check_ruby_version
+    if Recipe.ruby1_8?
+      puts 'Requires Ruby 1.9 or higher.'
+      puts 'http://www.ruby-lang.org/'
+      exit
     end
   end
 end

data/lib/version.rb

@@ -2,5 +2,5 @@
 # Specs
 #
 module Specs
-  VERSION = '0.19'
+  VERSION = '0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specs
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
 platform: ruby
 authors:
 - Andrew Pennebaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-system-with-aliases
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: contracts
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +331,7 @@ files:
 - lib/aspects/ld.rb
 - lib/aspects/links.rb
 - lib/aspects/lua.rb
+- lib/aspects/memcached.rb
 - lib/aspects/net.rb
 - lib/aspects/node.rb
 - lib/aspects/npm.rb
@@ -345,6 +360,7 @@ files:
 - lib/aspects/thunderbolt.rb
 - lib/aspects/virtualbox.rb
 - lib/aspects/xcode.rb
+- lib/cli.rb
 - lib/specs.rb
 - lib/version.rb
 homepage: https://github.com/mcandre/specs
@@ -367,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Software version information at your fingertips