Browse files

Fix version compatibility issue

  • Loading branch information...
1 parent 9dd6a3c commit eb872c4acc820b91deb6408b62c68d44f4da008e @RyanScottLewis RyanScottLewis committed Nov 20, 2012
Showing with 18 additions and 20 deletions.
  1. +1 −1 Gemfile.lock
  2. +11 −8 lib/system.rb
  3. +1 −1 lib/system/backwards_compatibility.rb
  4. +1 −1 lib/system/cpu.rb
  5. +1 −1 lib/system/os.rb
  6. +1 −1 lib/system/ruby.rb
  7. +0 −5 lib/system/version.rb
  8. +2 −2 system.gemspec
View
2 Gemfile.lock
@@ -2,6 +2,7 @@ PATH
remote: .
specs:
system (0.1.1)
+ 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)
View
19 lib/system.rb
@@ -1,6 +1,8 @@
# 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..
@@ -12,16 +14,17 @@
__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'
View
2 lib/system/backwards_compatibility.rb
@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
class System
class << self
View
2 lib/system/cpu.rb
@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
class System
View
2 lib/system/os.rb
@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
class System
View
2 lib/system/ruby.rb
@@ -1,4 +1,4 @@
-require 'system/version'
+require 'system'
class System
View
5 lib/system/version.rb
@@ -1,5 +0,0 @@
-require 'version'
-
-class System
- is_versioned
-end
View
4 system.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
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"]
@@ -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"])

0 comments on commit eb872c4

Please sign in to comment.