which_osx 1.0.3 → 1.0.4

data/README.md

@@ -1,17 +1,20 @@
-= which_osx
+# which_osx
 
-* http://github.com/imkmf/which_osx
+![The contemplative Mac](http://i.imgur.com/RNIc8.png)
 
-== DESCRIPTION:
+- http://github.com/imkmf/which_osx
 
-A simple ruby program for returning the version number of the current Mac OS X system.
+## DESCRIPTION:
 
-== FEATURES/PROBLEMS:
+A simple ruby program for outputting some information about your Mac.
 
-* Uses the terminal command `sw_vers` and parses it into a readable format.
-* TODO : Catch if it's *not* OS X - whether that's Windows, or Linux.
+## FEATURES/PROBLEMS:
 
-== SYNOPSIS:
+- Uses the terminal command `sw_vers` and parses it into a readable format.
+
+- **This doesn't work on anything but Mac. Seriously. You won't be able to do much with this gem on anywhere but OS X.**
+
+## USAGE:
 
 which_osx can be imported into a project and used to return the current version of OS X (as of writing, my computer returns "10.7.3"):
 
@@ -23,20 +26,28 @@ which_osx can be imported into a project and used to return the current version
         end
     end
 
-It also can be used from the command-line:
+which_osx version 1.0.3 adds new methods for different outputs:
+
+    $ WhichOSX.full_name
+    => Mac OS X 10.7.3
+
+    $ WhichOSX.short_name
+    => Lion
+
+Running from the command line returns the OS version by default:
 
-`$ which_osx`    
-`10.7.3`
+    $ which_osx   
+    => 10.7.3
 
-== REQUIREMENTS:
+## REQUIREMENTS:
 
-* None
+- None
 
-== INSTALL:
+## INSTALL:
 
     sudo gem install which_osx
 
-== DEVELOPERS:
+## DEVELOPERS:
 
 After checking out the source, run:
 
@@ -45,11 +56,11 @@ After checking out the source, run:
 This task will install any missing dependencies, run the tests/specs,
 and generate the RDoc.
 
-== LICENSE:
+## LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2012 FIX
+Copyright (c) 2012 Kristian Freeman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/version.rb

@@ -1,3 +1,3 @@
 module WhichOsx
-  VERSION = "1.0.3"
-end
+  VERSION = "1.0.4"
+end

data/lib/which_osx.rb

@@ -17,9 +17,9 @@ module WhichOSX
     
   end
 
-  def self.full_version
-    full_version = "Mac OS X " + VERSION
-    return full_version
+  def self.full_name
+    full_name = "Mac OS X " + VERSION
+    return full_name
   end
 
   def self.short_name

data/spec/which_osx_spec.rb

@@ -9,7 +9,7 @@ require 'which_osx'
     end
 
     it "should convert version to a nice string" do
-      WhichOSX.version.should === "10.7.3"
+      WhichOSX.version.should =~ /[0-9][0-9].[0-9].[0-9]/
     end
 
     # it "should tell you when you're not on Mac OS X" do
@@ -17,19 +17,19 @@ require 'which_osx'
     # end
   end
 
-  describe "full version" do
+  describe "full name" do
     it "should return the full name of the OS" do
-      WhichOSX.full_version.should === "Mac OS X 10.7.3"
+      WhichOSX.full_name.should =~ /Mac OS X [0-9][0-9].[0-9].[0-9]/
     end
   end
 
   describe "short name" do
     it "should chomp the version into a major release number" do
-      WhichOSX.version.chop.chop.should === "10.7"
+      WhichOSX.version.chop.chop.should =~ /[0-9][0-9].[0-9]/
     end
 
     it "should return a major release name (Lion, Leopard, etc.)" do
-      WhichOSX.short_name.should === "Lion"
+      WhichOSX.short_name.should =~ /Lion|Leopard|Snow Leopard|Tiger|Panther/
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: which_osx
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: ''
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement