merging in bundler, because it's 2015

6 files changed, 42 insertions, 78 deletions

diff --git a/.gitignore b/.gitignore
index a8af106..85d89b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,18 @@
-*.sw?
+*.a
+/.bundle/
+*.bundle
+/coverage/
+/doc/
 .DS_Store
-coverage
+/Gemfile.lock
+ipaddr.html
+mkmf.log
+*.o
+/pkg/
 rdoc
-pkg
 server.rb
-ipaddr.html
-Gemfile.lock
-/.bundle/
-/vendor/
+*.so
+/spec/reports/
+*.sw?
+/tmp/
+/_yardoc/
diff --git a/Gemfile b/Gemfile
index 901f575..b4e2a20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1 +1,3 @@
-gemspec
\ No newline at end of file
+source "https://rubygems.org"
+
+gemspec
diff --git a/LICENSE b/LICENSE.txt
index 943eee1..943eee1 100644
--- a/LICENSE
+++ b/LICENSE.txt
diff --git a/Rakefile b/Rakefile
index b7dbf64..792f86f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,25 +1,8 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require "bundler/gem_tasks"
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ipaddress"
-    gem.summary = %Q{IPv4/IPv6 addresses manipulation library}
-    gem.email = "ceresa@gmail.com"
-    gem.homepage = "http://github.com/bluemonk/ipaddress"
-    gem.authors = ["Marco Ceresa"]
-    gem.description   = <<-EOD
-      IPAddress is a Ruby library designed to make manipulation 
-      of IPv4 and IPv6 addresses both powerful and simple. It mantains
-      a layer of compatibility with Ruby's own IPAddr, while 
-      addressing many of its issues.
-    EOD
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
diff --git a/ipaddress.gemspec b/ipaddress.gemspec
index 7399c21..dfcf8d5 100644
--- a/ipaddress.gemspec
+++ b/ipaddress.gemspec
@@ -1,58 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ipaddress/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{ipaddress}
-  s.version = IO.read("VERSION")
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marco Ceresa", "Mike Mackintosh"]
-  s.date = %q{2015-03-22}
-  s.description = %q{      IPAddress is a Ruby library designed to make manipulation 
+Gem::Specification.new do |spec|
+  spec.name          = "ipaddress"
+  spec.version       = Ipaddress::VERSION
+  spec.authors       = ["bluemonk", "mikemackintosh"]
+  spec.email         = ["ceresa@gmail.com"]
+  spec.summary       = %q{IPv4/IPv6 address manipulation library}
+  spec.description   = %q{IPAddress is a Ruby library designed to make manipulation 
       of IPv4 and IPv6 addresses both powerful and simple. It mantains
       a layer of compatibility with Ruby's own IPAddr, while 
-      addressing many of its issues.
-}
-  s.email = %q{ceresa@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.rdoc",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "ipaddress.gemspec",
-    "lib/ipaddress.rb",
-    "lib/ipaddress/ipv4.rb",
-    "lib/ipaddress/ipv6.rb",
-    "lib/ipaddress/prefix.rb",
-    "lib/ipaddress/mongoid.rb",
-    "test/ipaddress/ipv4_test.rb",
-    "test/ipaddress/ipv6_test.rb",
-    "test/ipaddress/prefix_test.rb",
-    "test/ipaddress/mongoid_test.rb",
-    "test/ipaddress_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bluemonk/ipaddress}
-  s.license = 'MIT'
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{IPv4/IPv6 addresses manipulation library}
+      addressing many of its issues.}
+  spec.homepage      = "https://github.com/bluemonk/ipaddress"
+  spec.license       = "MIT"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake", "~> 10.0"
 end
-
diff --git a/lib/ipaddress/version.rb b/lib/ipaddress/version.rb
new file mode 100644
index 0000000..73aae68
--- /dev/null
+++ b/lib/ipaddress/version.rb
@@ -0,0 +1,3 @@
+module Ipaddress
+  VERSION = "0.8.0"
+end