specs 0.3 → 0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWRhMzIxODY1MTg5ODdjZWVmOGIwYmYzMTg5MThiMjJjYTY4OTFiZg==
+  data.tar.gz: !binary |-
+    ZDVmNWZlMjJjOGEzODlmY2UyNGI2OGJiNjI4ODZmNTU5ODI5NDdhNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjljM2M3NjkwYzA4ZDkxYzZmMzJkMTljMjRkNmI4ZTQwNWQ1YzlkN2RiOGY0
+    NzJmOGY5MjY2ODc4ZDViNmE2MTcwMGVmOTllZDFkNmI5MDBiMWNkMjdlZGY2
+    ZDRlOGZjYzQ3YjQxNWIwYTA1ZDMzNzFiZDc5MzkwNWMxZGNmODI=
+  data.tar.gz: !binary |-
+    Mjc2MzkxNzY3MDk1NzgzNGI0NjRmN2Q0NDRkYTE1M2VkMDA3MDE3MjdmMTll
+    MjAzN2U1OTUwMTcxNDYxMTJiZGY0OTNmMDk1ODdhOGM0MTg1ZGFkNjY2NjYw
+    OTZjODUxZjkyMDU0NTk3MDQ3ZjgyODFkZWQwYWQzOWJmZDE1M2Q=

data/LICENSE.md

@@ -1,23 +1,23 @@
-# FreeBSD License
-
-# Copyright 2012 Andrew Pennebaker. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# FreeBSD License
+
+# Copyright 2012 Andrew Pennebaker. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/bin/specs

@@ -1,10 +1,10 @@
-#!/bin/env ruby
-
-require "rubygems"
-require "specs"
-
-begin
-	main
-rescue Interrupt => e
-	nil
-end
+#!/bin/env ruby
+
+require "rubygems"
+require "specs"
+
+begin
+  main
+rescue Interrupt => e
+  nil
+end

data/lib/aspects/chrome.rb

@@ -4,11 +4,7 @@ module Recipe
     if Os.mac?
       "/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version 2>&1 | grep -v Unsure" # Redirect stderr to stdout
     elsif Os.windows?
-      if Os.x86_64?
-        "%UserProfile%\\AppData\\Local\\Google\\Chrome\\Application\\chrome --version"
-      else
-        "\"C:\\Program Files\\Google\\Chrome\\Application\\chrome\" --version"
-      end
+      "reg query \"HKEY_LOCAL_MACHINE\\SOFTWARE\\Google\\Update\\Clients\\{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}\""
       # Assumes
       # * binary is google-chrome.
       # * binary is in PATH.

data/lib/aspects/clojure.rb

@@ -4,7 +4,7 @@ module Recipe
   end
 
   def self.clj
-    "clj -e '(println \"Clojure \" (clojure-version))'"
+    "lein exec '(println \"Clojure \" (clojure-version))'"
   end
 
   def self.clojure

data/lib/aspects/oz.rb

@@ -0,0 +1,5 @@
+module Recipe
+  def self.oz
+    "ozc -v"
+  end
+end

data/lib/specs.rb

@@ -29,7 +29,7 @@
 require "getoptlong"
 require "pathname"
 
-SPECS_VERSION = "0.3"
+SPECS_VERSION = "0.4"
 SPECS_VERSION_STRING = "specs #{SPECS_VERSION}"
 SPECS_HOME_PAGE = "https://github.com/mcandre/specs#readme"
 
@@ -187,9 +187,8 @@ def run(cmd, aspect)
   # Newline to visually separate multiple aspect commands.
   puts ""
 
-  if cmd.nil?
+  if !cmd
     puts "#{aspect} aspect not implemented for this system"
-
   elsif cmd == SPECS_VERSION_STRING
     puts "specs --version"
     puts SPECS_VERSION_STRING
@@ -206,16 +205,6 @@ def run(cmd, aspect)
   end
 end
 
-def usage
-  system "more specs.rb"
-  exit
-end
-
-def print_specs_own_version
-  puts SPECS_VERSION_STRING
-  puts SPECS_HOME_PAGE
-end
-
 def check_ruby_version
   if RUBY_VERSION =~ /^1\.8/
     puts "Requires Ruby 1.9+"
@@ -227,23 +216,9 @@ end
 def main
   check_ruby_version
 
-  opts = GetoptLong.new(
-                        ["--help", "-h", GetoptLong::NO_ARGUMENT],
-                        ["--version", "-v", GetoptLong::NO_ARGUMENT]
-                        )
-
-  begin
-    opts.each { |option, value|
-      case option
-      when "--help"
-        usage
-      when "--version"
-        print_specs_own_version
-      end
-    }
-  rescue GetoptLong::InvalidOption
-    usage
-  end
+  puts "Specs:\n\n#{SPECS_VERSION_STRING}\n#{SPECS_HOME_PAGE}"
+
+  exit if ARGV.include?("--version")
 
   # Default aspects
   aspects = ["specs", "os", "hardware"]
@@ -252,15 +227,13 @@ def main
   end
 
   aspects = aspects - ["specs"]
-  puts "Specs:\n\n"
-  print_specs_own_version
 
   aspects.each { |aspect|
     # What does the aspect module say to run
     # in order to retrieve the aspect information?
     cmds = command(aspect)
 
-    if cmds.nil? or cmds.instance_of?(String)
+    if !cmds or cmds.instance_of?(String)
       run(cmds, aspect)
       # Module returns an array of command strings.
     elsif cmds.instance_of?(Array)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specs
 version: !ruby/object:Gem::Version
-  version: '0.3'
-  prerelease: 
+  version: '0.4'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -39,6 +38,7 @@ files:
 - lib/aspects/node.rb
 - lib/aspects/ocaml.rb
 - lib/aspects/opera.rb
+- lib/aspects/oz.rb
 - lib/aspects/perl.rb
 - lib/aspects/powershell.rb
 - lib/aspects/ram.rb
@@ -52,26 +52,25 @@ files:
 - bin/specs
 homepage: https://github.com/mcandre/specs
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Software version information at your fingertips
 test_files: []