Merge pull request #22 from Adam21e/gem_update

Update folders to ipaddress_2 for gem to load
ipaddress2-gem · Jan 22, 2019 · 806f948 · 806f948
2 parents d370a36 + eba6f4d
commit 806f948
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,13 @@
 ## [Unreleased]
 
+## 0.11.0
+
 ### Enhancements
 * Added 'find\_adjacent_subnet' to IPv6
 
+### Bugfix
+* Update folders for gem to work
+
 ## 0.10.0
 
 ### Enhancements

diff --git a/Rakefile b/Rakefile
@@ -45,7 +45,7 @@ end
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -I lib -r ipaddress.rb"
+  sh "irb -I lib -r ipaddress_2.rb"
 end
 
 desc "Look for TODO and FIXME tags in the code"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.10.0
+0.11.0
diff --git a/ipaddress_2.gemspec b/ipaddress_2.gemspec
@@ -1,12 +1,11 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ipaddress/version'
+require 'ipaddress_2/version'
 
 Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.summary = "IPv4/IPv6 address manipulation library"
   s.name = "ipaddress_2"
-  s.version = "0.9.0"
   s.version = IPAddress::VERSION
   s.require_paths = ["lib"]
   s.authors = ["bluemonk", "mikemackintosh"]

diff --git a/lib/ipaddress.rb → lib/ipaddress_2.rb b/lib/ipaddress.rb → lib/ipaddress_2.rb
@@ -12,9 +12,9 @@
 #
 #++
 
-require 'ipaddress/ipv4'
-require 'ipaddress/ipv6'
-require 'ipaddress/mongoid' if defined?(Mongoid)
+require 'ipaddress_2/ipv4'
+require 'ipaddress_2/ipv6'
+require 'ipaddress_2/mongoid' if defined?(Mongoid)
 
 module IPAddress
 

diff --git a/lib/ipaddress/ipv4.rb → lib/ipaddress_2/ipv4.rb b/lib/ipaddress/ipv4.rb → lib/ipaddress_2/ipv4.rb
@@ -1,4 +1,4 @@
-require 'ipaddress/prefix'
+require 'ipaddress_2/prefix'
 
 module IPAddress; 
   # 

diff --git a/lib/ipaddress/ipv6.rb → lib/ipaddress_2/ipv6.rb b/lib/ipaddress/ipv6.rb → lib/ipaddress_2/ipv6.rb
@@ -1,4 +1,4 @@
-require 'ipaddress/prefix'
+require 'ipaddress_2/prefix'
 
 module IPAddress;
   #

diff --git a/lib/ipaddress/mongoid.rb → lib/ipaddress_2/mongoid.rb b/lib/ipaddress/mongoid.rb → lib/ipaddress_2/mongoid.rb
diff --git a/lib/ipaddress/prefix.rb → lib/ipaddress_2/prefix.rb b/lib/ipaddress/prefix.rb → lib/ipaddress_2/prefix.rb
diff --git a/lib/ipaddress/version.rb → lib/ipaddress_2/version.rb b/lib/ipaddress/version.rb → lib/ipaddress_2/version.rb
@@ -1,3 +1,3 @@
 module IPAddress
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end
diff --git a/test/ipaddress/ipv4_test.rb → test/ipaddress_2/ipv4_test.rb b/test/ipaddress/ipv4_test.rb → test/ipaddress_2/ipv4_test.rb
diff --git a/test/ipaddress/ipv6_test.rb → test/ipaddress_2/ipv6_test.rb b/test/ipaddress/ipv6_test.rb → test/ipaddress_2/ipv6_test.rb
diff --git a/test/ipaddress/mongoid_test.rb → test/ipaddress_2/mongoid_test.rb b/test/ipaddress/mongoid_test.rb → test/ipaddress_2/mongoid_test.rb
@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'ipaddress/mongoid'
+require 'ipaddress_2/mongoid'
 
 class MongoidTest < Minitest::Test
 

diff --git a/test/ipaddress/prefix_test.rb → test/ipaddress_2/prefix_test.rb b/test/ipaddress/prefix_test.rb → test/ipaddress_2/prefix_test.rb
diff --git a/test/ipaddress_test.rb → test/ipaddress_2_test.rb b/test/ipaddress_test.rb → test/ipaddress_2_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -5,7 +5,7 @@
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'ipaddress'
+require 'ipaddress_2'
 
 if Minitest.const_defined?('Test')
   # We're on Minitest 5+. Nothing to do here.