specs 0.7 → 0.8

data/lib/aspects/ie.rb

@@ -1,7 +1,7 @@
-module Recipe
-  def self.ie
-    if Os.windows?
-      "reg query \"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Internet Explorer\" /v Version"
-    end
-  end
-end
+module Recipe
+  def self.ie
+    if Os.windows?
+      'reg query "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Internet Explorer" /v Version'
+    end
+  end
+end

data/lib/aspects/inkscape.rb

@@ -1,16 +1,16 @@
-module Recipe
-  def self.inkscape
-    case Os.os_name
-    when :windows
-      if Os.x86_64?
-        "C:\\Program Files (x86)\\Inkscape\\inkscape --version"
-      else
-        "\"C:\\Program Files\\Inkscape\\inkscape\" --version"
-      end
-    when :mac
-      "/Applications/Inkscape.app/Contents/Resources/bin/inkscape --version"
-    else
-      "inkscape --version"      
-    end
-  end
-end
+module Recipe
+  def self.inkscape
+    case Os.os_name
+    when :windows
+      if Os.x86_64?
+        'C:\\Program Files (x86)\\Inkscape\\inkscape --version'
+      else
+        '"C:\\Program Files\\Inkscape\\inkscape" --version'
+      end
+    when :mac
+      '/Applications/Inkscape.app/Contents/Resources/bin/inkscape --version'
+    else
+      'inkscape --version'
+    end
+  end
+end

data/lib/aspects/java.rb

@@ -1,30 +1,30 @@
 module Recipe
   def self.mvn
-    "mvn --version"
+    'mvn --version'
   end
 
   def self.classpath
-    if Os.windows? and not Os.mingw?
-      "echo %CLASSPATH"
+    if Os.windows? && !Os.mingw?
+      'echo %CLASSPATH'
     else
-      "echo $CLASSPATH"
+      'echo $CLASSPATH'
     end
   end
 
   def self.javahome
-    if Os.windows? and not Os.mingw?
-      "echo %JAVA_HOME%"
+    if Os.windows? && !Os.mingw?
+      'echo %JAVA_HOME%'
     else
-      "echo $JAVA_HOME"
+      'echo $JAVA_HOME'
     end
   end
 
   def self.oak
-    "java -version"
+    'java -version'
   end
 
   def self.oakc
-    "javac -version"
+    'javac -version'
   end
 
   def self.java

data/lib/aspects/lacheck.rb

@@ -0,0 +1,5 @@
+module Recipe
+  def self.lacheck
+    'lacheck | grep lacheck.lex'
+  end
+end

data/lib/aspects/latex.rb

@@ -1,7 +1,7 @@
-module Recipe
-  def self.latex
-    if Os.unix?
-      "pdflatex --version"
-    end
-  end
-end
+module Recipe
+  def self.latex
+    if Os.unix?
+      'pdflatex --version'
+    end
+  end
+end

data/lib/aspects/ld.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.ld
-    "ld -v"
-  end
-end
+module Recipe
+  def self.ld
+    'ld -v'
+  end
+end

data/lib/aspects/links.rb

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

data/lib/aspects/lua.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.lua
-    "lua -v"
-  end
-end
+module Recipe
+  def self.lua
+    'lua -v'
+  end
+end

data/lib/aspects/net.rb

@@ -1,5 +1,5 @@
-module Recipe
-  def self.net
-    "ruby -e \"require 'net/http'; puts Net::HTTP.new('icanhazip.com').request(Net::HTTP::Get.new('/', {'User-Agent'=>'curl'})).body\""
-  end
-end
+module Recipe
+  def self.net
+    'ruby -e "require \'net/http\'; puts Net::HTTP.new(\'icanhazip.com\').request(Net::HTTP::Get.new(\'/\', {\'User-Agent\'=>\'curl\'})).body"'
+  end
+end

data/lib/aspects/node.rb

@@ -1,19 +1,19 @@
-module Recipe
-  module Package
-    def self.npm(package)
-      "npm list #{package}"
-    end
-  end
-
-  def self.npm_tool
-    "npm --version"
-  end
-
-  def self.js
-    "node --version"
-  end
-
-  def self.node
-    [npm_tool, js]
-  end
-end
+module Recipe
+  module Package
+    def self.npm(package)
+      "npm list #{package}"
+    end
+  end
+
+  def self.npm_tool
+    'npm --version'
+  end
+
+  def self.js
+    'node --version'
+  end
+
+  def self.node
+    [npm_tool, js]
+  end
+end

data/lib/aspects/ocaml.rb

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

data/lib/aspects/opera.rb

@@ -1,14 +1,14 @@
-module Recipe
-  def self.opera
-    # Assumes opera in PATH.
-    if Os.unix? and not Os.mac?
-      "opera -version"
-      # Opera for Mac/Windows does not support the -version command line option.
-      # # Assumes Opera is installed in the default directory.
-      # elsif Os.mac?
-      #       "/Applications/Opera.app/Contents/MacOS/Opera -version"
-      # elsif Os.windows?
-      #       "C:\\Program Files (x86)\\Opera\\opera -version"
-    end
-  end
-end
+module Recipe
+  def self.opera
+    # Assumes opera in PATH.
+    if Os.unix? && !Os.mac?
+      'opera -version'
+      # Opera for Mac/Windows does not support the -version command line option.
+      # # Assumes Opera is installed in the default directory.
+      # elsif Os.mac?
+      #       '/Applications/Opera.app/Contents/MacOS/Opera -version'
+      # elsif Os.windows?
+      #       'C:\\Program Files (x86)\\Opera\\opera -version'
+    end
+  end
+end

data/lib/aspects/oz.rb

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

data/lib/aspects/perl.rb

@@ -1,10 +1,10 @@
 module Recipe
   def self.cpan
-    "cpan --version"
+    'cpan --version'
   end
 
   def self.pl
-    "perl --version"
+    'perl --version'
   end
 
   def self.perl

data/lib/aspects/php.rb

@@ -0,0 +1,13 @@
+module Recipe
+  def self.pear
+    'pear version'
+  end
+
+  def self.ph
+    'php --version'
+  end
+
+  def self.php
+    [pear, ph]
+  end
+end

data/lib/aspects/powershell.rb

@@ -1,7 +1,7 @@
-module Recipe
-  def self.powershell
-    if Os.windows?
-      "@powershell Get-Host"
-    end
-  end
-end
+module Recipe
+  def self.powershell
+    if Os.windows?
+      '@powershell Get-Host'
+    end
+  end
+end

data/lib/aspects/python.rb

@@ -1,13 +1,13 @@
-module Recipe
-  def self.pip
-    "pip --version"
-  end
-
-  def self.py
-    "python --version"
-  end
-
-  def self.python
-    [pip, py]
-  end
-end
+module Recipe
+  def self.pip
+    'pip --version'
+  end
+
+  def self.py
+    'python --version'
+  end
+
+  def self.python
+    [pip, py]
+  end
+end

data/lib/aspects/python3.rb

@@ -0,0 +1,13 @@
+module Recipe
+  def self.pip3
+    'pip3 --version'
+  end
+
+  def self.py3
+    'python3 --version'
+  end
+
+  def self.python3
+    [pip3, py3]
+  end
+end

data/lib/aspects/ram.rb

@@ -1,11 +1,11 @@
-module Recipe
-  def self.ram
-    if Os.windows?
-      "systeminfo | findstr /C:\"Total Physical Memory\""
-    elsif Os.mac?
-      "system_profiler | grep 'Memory:'"
-    else
-      "grep MemTotal /proc/meminfo"
-    end
-  end
-end
+module Recipe
+  def self.ram
+    if Os.windows?
+      'systeminfo | findstr /C:"Total Physical Memory"'
+    elsif Os.mac?
+      'system_profiler | grep \'Memory:\''
+    else
+      'grep MemTotal /proc/meminfo'
+    end
+  end
+end

data/lib/aspects/redis.rb

@@ -1,13 +1,19 @@
 module Recipe
   def self.redis_cli
-    "redis-cli --version"
+    'redis-cli --version'
   end
 
   def self.redis_server
-    "redis-server --version"
+    'redis-server --version'
   end
 
   def self.redis
-    [redis_cli, redis_server]
+    # In Windows, Redis server is provided as a service
+    # instead of a CLI program.
+    if Os.windows?
+      redis_cli
+    else
+      [redis_cli, redis_server]
+    end
   end
 end

data/lib/aspects/ruby.rb

@@ -1,23 +1,23 @@
-module Recipe
-  module Package
-    def self.gem(package)
-      "gem list | grep #{package}"
-    end
-  end
-
-  def self.bundler
-    "bundle --version"
-  end
-
-  def self.rubygems
-    "gem --version"
-  end
-
-  def self.rb
-    "ruby --version"
-  end
-
-  def self.ruby
-    [bundler, rubygems, rb]
-  end
-end
+module Recipe
+  module Package
+    def self.gem(package)
+      "gem list | grep #{package}"
+    end
+  end
+
+  def self.bundler
+    'bundle --version'
+  end
+
+  def self.rubygems
+    'gem --version'
+  end
+
+  def self.rb
+    'ruby --version'
+  end
+
+  def self.ruby
+    [bundler, rubygems, rb]
+  end
+end

data/lib/aspects/scala.rb

@@ -1,13 +1,13 @@
 module Recipe
   def self.scalac
-    "scalac -version"
+    'scalac -version'
   end
 
   def self.sbt
-    "sbt sbt-version"
+    'sbt sbt-version'
   end
 
   def self.scala
-    [sbt, scalac, java]
+    [sbt, scalac]
   end
 end