specs 0.7 → 0.8

data/lib/aspects/shell.rb

@@ -1,9 +1,9 @@
-module Recipe
-  def self.shell
-    if Os.windows?
-      "echo %cmdextversion%"
-    elsif Os.unix?
-      "sh --version"
-    end
-  end
-end
+module Recipe
+  def self.shell
+    if Os.windows?
+      'echo %cmdextversion%'
+    elsif Os.unix?
+      'sh --version'
+    end
+  end
+end

data/lib/aspects/splint.rb

@@ -0,0 +1,5 @@
+module Recipe
+  def self.splint
+    'splint -help version'
+  end
+end

data/lib/aspects/ssh.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.ssh
-    "ssh -V"
-  end
-end
+module Recipe
+  def self.ssh
+    'ssh -V'
+  end
+end

data/lib/aspects/tap.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.tap
-    "tap --version"
-  end
-end
+module Recipe
+  def self.tap
+    'tap --version'
+  end
+end

data/lib/aspects/thrift.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.thrift
-    "thrift -version"
-  end
-end
+module Recipe
+  def self.thrift
+    'thrift -version'
+  end
+end

data/lib/aspects/virtualbox.rb

@@ -1,16 +1,16 @@
-module Recipe
-  def self.virtualbox
-    case Os.os_name
-    when :windows
-      if Os.x86?
-        "\"C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage\" --version"
-      else
-        "C:\\Program Files (x86)\\Oracle\\VirtualBox\\VBoxManage --version"
-      end
-    when :mac
-      "/Applications/Firefox.app/Contents/MacOS/firefox --version"
-    else
-      "firefox --version"      
-    end
-  end
-end
+module Recipe
+  def self.virtualbox
+    case Os.os_name
+    when :windows
+      if Os.x86?
+        '"C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage" --version'
+      else
+        'C:\\Program Files (x86)\\Oracle\\VirtualBox\\VBoxManage --version'
+      end
+    when :mac
+      '/Applications/Firefox.app/Contents/MacOS/firefox --version'
+    else
+      'firefox --version'
+    end
+  end
+end

data/lib/aspects/xcode.rb

@@ -1,7 +1,7 @@
-module Recipe
-  def self.xcode
-    if Os.mac?
-      "xcodebuild -version"
-    end
-  end
-end
+module Recipe
+  def self.xcode
+    if Os.mac?
+      'xcodebuild -version'
+    end
+  end
+end

data/lib/specs.rb

@@ -26,64 +26,76 @@
 # --version, -v:
 #    print specs' own version
 
-require "getoptlong"
-require "pathname"
+require 'getoptlong'
+require 'pathname'
+require 'contracts'
+include Contracts
 
-require "version"
+require 'version'
 SPECS_VERSION_STRING = "specs #{Specs::VERSION}"
 
-SPECS_HOME_PAGE = "https://github.com/mcandre/specs#readme"
+SPECS_HOME_PAGE = 'https://github.com/mcandre/specs#readme'
 
 SPECS_DIR = Pathname.new(File.dirname(__FILE__))
 
 # Get the basic operating system name reliably, even in JRuby
 # Useful for OS-contextual command line instructions.
 #
-# E.g., "C:\Program Files (x86)\Mozilla Firefox\firefox --version" in Windows vs
-#       "/Applications/Firefox.app/Contents/MacOS/firefox --version" in Mac vs
-#       "firefox --version" in Unix
+# E.g., 'C:\Program Files (x86)\Mozilla Firefox\firefox --version' in Windows vs
+#       '/Applications/Firefox.app/Contents/MacOS/firefox --version' in Mac vs
+#       'firefox --version' in Unix
 #
 module Os
+  Contract nil => String
   def self.raw
     # Config deprecated in Ruby 1.9
-    RbConfig::CONFIG["host_os"]
+    RbConfig::CONFIG['host_os']
   end
 
   # A series of OS descriptions.
   # Not all of these are mutually exclusive.
 
+  Contract nil => Bool
   def self.windows?
-    self.raw =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+    raw =~ /cygwin|mswin|mingw|bccwin|wince|emx/
   end
 
+  Contract nil => Bool
   def self.mingw?
-    self.raw =~ /cygwin|mingw/
+    raw =~ /cygwin|mingw/
   end
 
+  Contract nil => Bool
   def self.mac?
-    self.raw =~ /darwin/
+    raw =~ /darwin/
   end
 
+  Contract nil => Bool
   def self.unix?
-    not self.windows?
+    !self.windows?
   end
 
+  Contract nil => Bool
   def self.haiku?
-    self.raw =~ /haiku/
+    raw =~ /haiku/
   end
 
+  Contract nil => Bool
   def self.linux?
-    self.unix? and not (self.mac? or self.haiku?)
+    self.unix? && !(self.mac? || self.haiku?)
   end
 
+  Contract nil => Bool
   def self.x86_64?
-    RbConfig::CONFIG["arch"] =~ /64/
+    RbConfig::CONFIG['arch'] =~ /64/
   end
 
+  Contract nil => Bool
   def self.x86?
     !self.x86_64?
   end
 
+  Contract nil => Symbol
   def self.os_name
     if self.windows?
       :windows
@@ -99,76 +111,96 @@ module Os
   end
 end
 
+#
+# Recipe
+#
 module Recipe
+  #
+  # Package
+  #
   module Package
   end
 
+  Contract nil => String
   def self.command_not_found
     # Windows but not MinGW
-    if Os.windows? and !Os.mingw?
-      "not recognized as an internal or external command"
+    if Os.windows? && !Os.mingw?
+      'not recognized as an internal or external command'
       # MinGW or other Unix variant.
     else
-      "command not found"
+      'command not found'
     end
   end
 
+  Contract nil => String
   def self.os
     case Os.os_name
     when :windows
-      "systeminfo | findstr /B /C:\"OS Name\" /C:\"OS Version\""
+      'systeminfo | findstr /B /C:"OS Name" /C:"OS Version"'
     when :mac
-        "system_profiler SPSoftwareDataType | grep 'System Version'"
+      'system_profiler SPSoftwareDataType | grep \'System Version\''
     when :linux
-      "lsb_release -a"
+      'lsb_release -a'
     when :unix
-      "uname -a"
+      'uname -a'
+    # Punt.
+    else
+      'echo $OS'
     end
   end
 
+  Contract nil => String
   def self.arch
-    "ruby -rrbconfig -e 'puts RbConfig::CONFIG[\"arch\"]'"
+    '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
   end
 
+  Contract nil => Bool
   def self.ruby1_8?
     RUBY_VERSION =~ /^1\.8/
   end
 
+  Contract nil => Bool
   def self.ruby1_9?
     RUBY_VERSION =~ /^1\.9/
   end
 
+  Contract nil => Bool
   def self.ruby2?
     RUBY_VERSION =~ /^2/
   end
 
+  Contract nil => String
   def self.rubygems
-    "gem --version"
+    'gem --version'
   end
 
+  Contract nil => String
   def self.rb
-    "ruby --version"
+    'ruby --version'
   end
 
+  Contract nil => ArrayOf[String]
   def self.ruby
     [rubygems, rb]
   end
 end
 
-BUILTINS = ["specs", "os", "arch", "ruby"]
+BUILTINS = %w(specs os arch ruby)
 
 SEP = File::SEPARATOR
 
 # .../specs/aspects
-RECIPE_DIR = [SPECS_DIR, "aspects"].join(SEP)
+RECIPE_DIR = [SPECS_DIR, 'aspects'].join(SEP)
 
 Dir[File.join(RECIPE_DIR, '**', '*.rb')].each do |file|
   require File.expand_path(file)
@@ -176,20 +208,18 @@ end
 
 # For a given spec, return the command line instruction(s)
 # that will get the spec's version information.
-def command(aspect)
+def self.command(aspect)
   # Ruby methods can't use hypens (-),
   # So translate to underscores (_)
   # When looking up known aspects.
-  method = aspect.gsub("-", "_").to_sym
+  method = aspect.gsub('-', '_').to_sym
 
   # Package?
-  if aspect.include?(":")
-    package_manager, package = aspect.split(":")
+  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
+    Recipe::Package.send(package_manager, package) if Recipe::Package.methods.include?(package_manager)
   # Known aspect?
   elsif Recipe.methods.include?(method)
     Recipe.send(method)
@@ -202,14 +232,14 @@ end
 
 # Print a command line instruction and its output,
 # Emulating a user manually entering the instruction.
-def run(cmd, aspect)
+def self.run(cmd, aspect)
   # Newline to visually separate multiple aspect commands.
-  puts ""
+  puts ''
 
   if !cmd
     puts "#{aspect} aspect not implemented for this system"
   elsif cmd == SPECS_VERSION_STRING
-    puts "specs --version"
+    puts 'specs --version'
     puts SPECS_VERSION_STRING
   else
     puts cmd
@@ -224,18 +254,18 @@ def run(cmd, aspect)
   end
 end
 
-def check_ruby_version
+def self.check_ruby_version
   if Recipe.ruby1_8?
-    puts "Requires Ruby 1.9 or higher."
-    puts "http://www.ruby-lang.org/"
+    puts 'Requires Ruby 1.9 or higher.'
+    puts 'http://www.ruby-lang.org/'
     exit
   end
 end
 
-def usage
+def self.usage
   puts "Specs:\n\n#{SPECS_VERSION_STRING}\n#{SPECS_HOME_PAGE}"
 
-  exit if ARGV.include?("--version")
+  exit if ARGV.include?('--version')
 end
 
 def main
@@ -244,23 +274,22 @@ def main
   usage
 
   # Default aspects
-  aspects = ["os", "hardware"]
-  if !ARGV.empty?
-    aspects = ARGV
-  end
+  aspects = %w(os hardware)
+
+  aspects = ARGV unless ARGV.empty?
 
-  aspects = aspects - ["specs"]
+  aspects = aspects - ['specs']
 
-  aspects.each { |aspect|
+  aspects.each do |aspect|
     # What does the aspect module say to run
     # in order to retrieve the aspect information?
     cmds = command(aspect)
 
-    if !cmds or cmds.instance_of?(String)
+    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
 end

data/lib/version.rb

@@ -1,3 +1,6 @@
+#
+# Specs
+#
 module Specs
-  VERSION = "0.7"
+  VERSION = '0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specs
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: contracts
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,104 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: roodi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: churn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: excellent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tailor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +180,34 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,6 +249,7 @@ files:
 - lib/aspects/ie.rb
 - lib/aspects/inkscape.rb
 - lib/aspects/java.rb
+- lib/aspects/lacheck.rb
 - lib/aspects/latex.rb
 - lib/aspects/ld.rb
 - lib/aspects/links.rb
@@ -119,13 +260,16 @@ files:
 - lib/aspects/opera.rb
 - lib/aspects/oz.rb
 - lib/aspects/perl.rb
+- lib/aspects/php.rb
 - lib/aspects/powershell.rb
 - lib/aspects/python.rb
+- lib/aspects/python3.rb
 - lib/aspects/ram.rb
 - lib/aspects/redis.rb
 - lib/aspects/ruby.rb
 - lib/aspects/scala.rb
 - lib/aspects/shell.rb
+- lib/aspects/splint.rb
 - lib/aspects/ssh.rb
 - lib/aspects/tap.rb
 - lib/aspects/thrift.rb
@@ -153,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Software version information at your fingertips