system 0.1.1 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    system (0.1.1)
+    system (0.1.3)
+      version (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -66,4 +67,3 @@ DEPENDENCIES
   rake (~> 0.9)
   rb-fsevent (~> 0.9.1)
   system!
-  version (~> 1.0.0)

data/Rakefile

@@ -1,8 +1,15 @@
-require 'rake/version_task'
-require 'rspec/core/rake_task'
-require 'rubygems/package_task'
 require 'pathname'
 
+def require_task(path)
+  begin
+    require path
+    
+    yield
+  rescue LoadError
+    puts '', "Could not load '#{path}'.", 'Try to `rake gem:spec` and `bundle install` and try again.', ''
+  end
+end
+
 spec = Gem::Specification.new do |s|
   s.name         = 'system'
   s.version      = Pathname.new(__FILE__).dirname.join('VERSION').read.strip
@@ -15,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.files        = `git ls-files`.lines.to_a.collect { |s| s.strip }
   s.executables  = `git ls-files -- bin/*`.lines.to_a.collect { |s| File.basename(s.strip) }
   
-  s.add_development_dependency 'version', '~> 1.0.0'
+  s.add_dependency 'version', '~> 1.0.0'
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'guard-rspec', '~> 2.1.1'
   s.add_development_dependency 'guard-yard', '~> 2.0.1'
@@ -24,16 +31,27 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'kramdown', '~> 0.14.0'
 end
 
-Rake::VersionTask.new do |t|
-  t.with_git_tag = true
-  t.with_gemspec = spec
+
+require_task 'rake/version_task' do
+  Rake::VersionTask.new do |t|
+    t.with_git_tag = true
+    t.with_gemspec = spec
+  end
 end
 
-RSpec::Core::RakeTask.new
+namespace :gem do
+  desc 'Generate the gemspec defined in this Rakefile'
+  task :spec do
+    Pathname.new("#{spec.name}.gemspec").open('w') { |f| f.write(spec.to_ruby) }
+  end
+end
 
+require 'rubygems/package_task'
 Gem::PackageTask.new(spec) do |t|
   t.need_zip = false
   t.need_tar = false
 end
 
-task :default => :spec
+task :default do
+  puts `rake -T`
+end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/system.rb

@@ -1,27 +1,30 @@
 # System includes
 require 'rbconfig'
 require 'pathname'
+require 'bundler/setup'
+require 'version'
 
 # Java includes - Have to load this way to avoid overloading of our classes
 if /java/.match(RUBY_PLATFORM) # TODO: For now, this is a good place for this but it will need abstracting..
   require 'java'
-  import 'java.lang.System'
+  java_import java.lang.System
 end
 
 # Prepare LOAD_PATH
 __LIB__ ||= Pathname.new(__FILE__).dirname
 $:.unshift(__LIB__.to_s) unless $:.include?(__LIB__.to_s)
 
-# Local includes
-require 'system/version'
-require 'system/ruby'
-require 'system/os'
-require 'system/cpu'
-require 'system/backwards_compatibility'
-
 # System is a cross-platform and cross-implementation interface to gather system information from the current host.
 # 
 # System offers a simple to use interface to gather an array of information including; OS, CPU, Filesystem, etc..
 # 
 # @since 0.1.0
-class System; end
+class System
+  is_versioned
+end
+
+# Local includes
+require 'system/ruby'
+require 'system/os'
+require 'system/cpu'
+require 'system/backwards_compatibility'

data/lib/system/backwards_compatibility.rb

@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
 
 class System
   class << self
@@ -9,6 +9,7 @@ class System
     #
     # @return [Symbol] The name of the operating system.
     # @since 0.1.0
+    # @deprecated 0.2.0
     def os
       System::OS.name
     end
@@ -20,6 +21,7 @@ class System
     #
     # @return [TrueClass, FalseClass] Is the current Ruby implementation using Java?
     # @since 0.1.0
+    # @deprecated 0.2.0
     def java?
       System::Ruby.java?
     end
@@ -30,6 +32,7 @@ class System
     #
     # @return [TrueClass, FalseClass] Is the current Ruby implementation JRuby?
     # @since 0.1.0
+    # @deprecated 0.2.0
     def jruby?
       System::Ruby.jruby?
     end

data/lib/system/cpu.rb

@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
 
 class System
   

data/lib/system/os.rb

@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
 
 class System
   
@@ -37,6 +37,64 @@ class System
     
     class << self
       
+      # @method linux?
+      # Get if the name of the operating system running on the current host is `System::OS::Linux`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :linux
+      #   System::OS.linux? # => true
+      
+      # @method windows?
+      # Get if the name of the operating system running on the current host is `System::OS::Windows`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :windows
+      #   System::OS.windows? # => true
+      
+      # @method solaris?
+      # Get if the name of the operating system running on the current host is `System::OS::Solaris`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :solaris
+      #   System::OS.solaris? # => true
+      
+      # @method bsd?
+      # Get if the name of the operating system running on the current host is `System::OS::BSD`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :bsd
+      #   System::OS.bsd? # => true
+      
+      # @method osx?
+      # Get if the name of the operating system running on the current host is `System::OS::OSX`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :osx
+      #   System::OS.osx? # => true
+      
+      # @method darwin?
+      # Get if the name of the operating system running on the current host is `System::OS::Darwin`.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::OS.name # => :darwin
+      #   System::OS.darwin? # => true
+      
+      [Linux, Windows, Solaris, BSD, OSX, Darwin].each do |name|
+        define_method("#{name}?") { self.name == name }
+      end
+      
       # Get the name of the operating system running on the current host.
       #
       # @return [Symbol] The name of the operating system.

data/lib/system/ruby.rb

@@ -1,100 +1,251 @@
-require 'system/version'
+require 'system'
+require 'system/os'
+require 'rubygems/platform'
 
 class System
   
-  # Information about the current Ruby implementation.
+  # Information about the current Ruby interpreter.
   # 
   # @since 0.1.1
   module Ruby
     class << self
       
+      # The C language.
+      # @since 0.1.3
+      C = :c
+      
+      # The C++ language.
+      # @since 0.1.3
+      CPlusPlus = :c_plus_plus
+      
+      # The Java language.
+      # @since 0.1.3
+      Java = :java
+      
+      # The Ruby interpreter: MRI.
+      # @since 0.1.3
+      MRI = :mri
+      
+      # The Ruby interpreter: JRuby.
+      # @since 0.1.3
+      JRuby = :jruby
+      
+      # The Ruby interpreter: Rubinius.
+      # @since 0.1.3
+      Rubinius = :rbx
+      
+      # The Ruby interpreter: MagLev.
+      # @since 0.1.3
+      MagLev = :maglev
+      
       # @method copyright
-      # Return the current Ruby implementation's copyright.
+      # Return the current Ruby interpreter's copyright.
       # 
       # @since 0.1.1
-      # @return [String] The current Ruby implementation's copyright.
+      # @return [String] The current Ruby interpreter's copyright.
       # @example
       #   System::Ruby.copyright # => "ruby - Copyright (C) 1993-2012 Yukihiro Matsumoto"
       
+      # @method copyright?
+      # Return if we have information about the copyright.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.copyright  # => "ruby - Copyright (C) 1993-2012 Yukihiro Matsumoto"
+      #   System::Ruby.copyright? # => true
+      
       # @method description
-      # Return the current Ruby implementation's description which includes the engine, version, 
+      # Return the current Ruby interpreter's description which includes the engine, version, 
       # release date, revision, and platform.
       # 
       # @since 0.1.1
-      # @return [String] The current Ruby implementation's engine.
+      # @return [String] The current Ruby interpreter's engine.
       # @example
-      #   System::Ruby.copyright # => "ruby"
+      #   System::Ruby.description # => "ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-darwin12.2.0]"
+      
+      # @method description?
+      # Return if we have information about the description.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.description  # => "ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-darwin12.2.0]"
+      #   System::Ruby.description? # => true
       
       # @method engine
-      # Return the current Ruby implementation's engine.
+      # Return the current Ruby interpreter's engine.
       # 
       # @since 0.1.1
-      # @return [String] The current Ruby implementation's engine.
+      # @return [String] The current Ruby interpreter's engine.
+      # @example
+      #   System::Ruby.engine # => "ruby"
+      
+      # @method engine?
+      # Return if we have information about the engine.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
       # @example
-      #   System::Ruby.copyright # => "ruby"
+      #   System::Ruby.engine # => "ruby"
+      #   System::Ruby.engine? # => true
       
       # @method patchlevel
-      # Return the current Ruby implementation's patch-level.
+      # Return the current Ruby interpreter's patch-level.
       # 
       # @since 0.1.1
-      # @return [Integer] The current Ruby implementation's patch-level.
+      # @return [Integer] The current Ruby interpreter's patch-level.
       # @example
       #   System::Ruby.patchlevel # => 286
       
+      # @method patchlevel?
+      # Return if we have information about the patchlevel.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.patchlevel # => 286
+      #   System::Ruby.patchlevel? # => true
+      
       # @method platform
-      # Return the system platform the current Ruby implementation is running on.
+      # Return the system platform the current Ruby interpreter is running on.
       # 
       # @since 0.1.1
-      # @return [String] The system platform the current Ruby implementation is running on.
+      # @return [String] The system platform the current Ruby interpreter is running on.
       # @example
       #   System::Ruby.platform # => "x86_64-darwin12.2.0"
       
+      # @method platform?
+      # Return if we have information about the platform.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.platform # => "x86_64-darwin12.2.0"
+      #   System::Ruby.platform? # => true
+      
       # @method revision
-      # Return the current Ruby implementation's revision.
+      # Return the current Ruby interpreter's revision.
       # 
       # @since 0.1.1
-      # @return [Integer] The current Ruby implementation's revision.
+      # @return [Integer] The current Ruby interpreter's revision.
+      # @example
+      #   System::Ruby.revision # => 37165
+      
+      # @method revision?
+      # Return if we have information about the revision.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
       # @example
       #   System::Ruby.revision # => 37165
+      #   System::Ruby.revision? # => true
       
       # @method release_date
-      # Return the current Ruby implementation's release date.
+      # Return the current Ruby interpreter's release date.
       # 
       # @since 0.1.1
-      # @return [String] The current Ruby implementation's release date.
+      # @return [String] The current Ruby interpreter's release date.
       # @example
       #   System::Ruby.release_date # => "2012-10-12"
       
+      # @method release_date?
+      # Return if we have information about the release_date.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.release_date # => "2012-10-12"
+      #   System::Ruby.release_date? # => true
+      
       # @method version
-      # Return the current Ruby implementation's version.
+      # Return the current Ruby interpreter's version.
       # 
       # @since 0.1.1
-      # @return [String] The current Ruby implementation's version.
+      # @return [String] The current Ruby interpreter's version.
       # @example
       #   System::Ruby.version # => "1.9.3"
       
+      # @method version?
+      # Return if we have information about the version.
+      # 
+      # @since 0.1.3
+      # @return [TrueClass, FalseClass]
+      # @example
+      #   System::Ruby.version # => "2012-10-12"
+      #   System::Ruby.version? # => true
+      
       Object.constants.grep(/^RUBY_/).each do |const_name|
         method_name = const_name.to_s.gsub(/^RUBY_/, '').downcase.to_sym
         
-        define_method(method_name) { Object.const_get(const_name) }
+        define_method(method_name) do
+          Object.const_defined?(const_name) ? Object.const_get(const_name) : nil
+        end
+        
+        define_method("#{method_name}?") { !send(method_name).nil? }
+      end
+      
+      # Return the current Ruby interpreter's name.
+      #
+      # @return [Symbol] The name of the operating system.
+      # @example Return OS name
+      #   System::OS.name # => :osx
+      # @example Assert current OS
+      #   System::OS.name == System::OS::OSX # => true
+      # @since 0.1.3
+      def name
+        @name ||= if !OS.windows? && ruby?
+          MRI
+        elsif ruby? && engine? && engine == 'rbx'
+          Rubinius
+        elsif ruby? && engine? && engine == 'maglev'
+          MagLev
+        elsif engine? && engine == 'jruby'
+          JRuby
+        end
       end
       
-      # Check if Ruby is using Java.
-      # Delegates to System::Ruby.java? for backwards compatibility.
+      # Return the current Ruby interpreter's base language.
       #
-      # @return [TrueClass, FalseClass] Is the current Ruby implementation using Java?
+      # @return [Symbol] The name of the base language.
+      # @example On MRI 1.9
+      #   System::Ruby.language # => :ruby
+      # @example On JRuby
+      #   System::Ruby.language # => :java
+      # @since 0.1.3
+      def language
+        @language ||= if %W[rbx maglev].any? { |name| engine == name }
+          CPlusPlus
+        elsif platform =~ /java/
+          Java
+        else
+          C
+        end
+      end
+      
+      # Check if Ruby is using Java as it's base language.
+      #
+      # @return [TrueClass, FalseClass]
       # @since 0.1.1
       def java?
-        !(/java/.match(platform).nil?)
+        language == Java
+      end
+      
+      # Check if Ruby is using C or CPlusPlus as it's base language.
+      #
+      # @return [TrueClass, FalseClass]
+      # @since 0.1.3
+      def ruby?
+        [C, CPlusPlus].any? { |language| self.language == language }
       end
       
-      # Check if Ruby is JRuby.
+      # Check if Ruby interpreter is JRuby.
       # Delegates to System::Ruby.jruby? for backwards compatibility.
       #
-      # @return [TrueClass, FalseClass] Is the current Ruby implementation JRuby?
+      # @return [TrueClass, FalseClass] Is the current Ruby interpreter JRuby?
       # @since 0.1.1
       def jruby?
-        java? ? !!(/jruby/.match(engine)) : false
+        java? ? engine =~ /jruby/ : false
       end
       
     end

data/system.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "system"
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roja Buck", "Ryan Scott Lewis"]
-  s.date = "2012-11-10"
+  s.date = "2012-11-20"
   s.description = "System is a pure ruby interface to gather systems information from the current host. System offers a simple to use interface to gather an array of information including; OS, CPU, Filesystem etc..."
   s.email = ["roja@arbia.co.uk", "ryan@rynet.us"]
-  s.files = [".gitignore", ".rvmrc", "Gemfile", "Gemfile.lock", "Guardfile", "LICENSE", "NOTES.md", "README.md", "Rakefile", "VERSION", "lib/system.rb", "lib/system/backwards_compatibility.rb", "lib/system/cpu.rb", "lib/system/os.rb", "lib/system/ruby.rb", "lib/system/version.rb", "spec/spec_helper.rb", "spec/system/backwards_compatibility_spec.rb", "spec/system/version_spec.rb", "system.gemspec"]
+  s.files = [".gitignore", ".rvmrc", "Gemfile", "Gemfile.lock", "Guardfile", "LICENSE", "NOTES.md", "README.md", "Rakefile", "VERSION", "lib/system.rb", "lib/system/backwards_compatibility.rb", "lib/system/cpu.rb", "lib/system/os.rb", "lib/system/ruby.rb", "spec/spec_helper.rb", "spec/system/backwards_compatibility_spec.rb", "spec/system/version_spec.rb", "system.gemspec"]
   s.homepage = "http://github.com/roja/system"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<version>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<version>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
       s.add_development_dependency(%q<guard-rspec>, ["~> 2.1.1"])
       s.add_development_dependency(%q<guard-yard>, ["~> 2.0.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: system
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version
@@ -20,7 +20,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -149,7 +149,6 @@ files:
 - lib/system/cpu.rb
 - lib/system/os.rb
 - lib/system/ruby.rb
-- lib/system/version.rb
 - spec/spec_helper.rb
 - spec/system/backwards_compatibility_spec.rb
 - spec/system/version_spec.rb
@@ -168,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1923509668655408142
+      hash: 2597936987996136108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/system/version.rb

@@ -1,5 +0,0 @@
-require 'version'
-
-class System
-  is_versioned
-end