From 45b69c635e5c57dee7a22061fb3f751ae4fe7c2f Mon Sep 17 00:00:00 2001 From: bluemonk Date: Sun, 27 Jul 2014 13:43:02 +0200 Subject: Bundler clean up: .gemspec file, update LICENSE and change version track file --- LICENSE | 20 -------------- LICENSE.txt | 20 ++++++++++++++ VERSION | 1 - ipaddress.gemspec | 69 ++++++++++++++---------------------------------- lib/ipaddress/version.rb | 3 +++ 5 files changed, 43 insertions(+), 70 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.txt delete mode 100644 VERSION create mode 100644 lib/ipaddress/version.rb diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 25def2b..0000000 --- a/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2009-2011 Marco Ceresa - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..95d8725 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2009-2014 Marco Ceresa + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/VERSION b/VERSION deleted file mode 100644 index 8adc70f..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.8.0 \ No newline at end of file diff --git a/ipaddress.gemspec b/ipaddress.gemspec index 41af7bf..7e24507 100644 --- a/ipaddress.gemspec +++ b/ipaddress.gemspec @@ -1,55 +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 = "0.8.0" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Marco Ceresa"] - s.date = %q{2011-05-17} - 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"] + 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", - "test/ipaddress/ipv4_test.rb", - "test/ipaddress/ipv6_test.rb", - "test/ipaddress/prefix_test.rb", - "test/ipaddress_test.rb", - "test/test_helper.rb" - ] - s.homepage = %q{http://github.com/bluemonk/ipaddress} - 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..87a4585 --- /dev/null +++ b/lib/ipaddress/version.rb @@ -0,0 +1,3 @@ +module Ipaddress + VERSION = "0.0.1" +end -- cgit v1.2.1 From 9444c09ed7af17403df4a0c0abbd7b42538dadc7 Mon Sep 17 00:00:00 2001 From: bluemonk Date: Sun, 27 Jul 2014 13:49:20 +0200 Subject: add Gemfile --- .gitignore | 19 +++++++++++++++---- Gemfile | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index e582264..85d89b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +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 +*.so +/spec/reports/ +*.sw? +/tmp/ +/_yardoc/ diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..b4e2a20 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gemspec -- cgit v1.2.1 From 5a7a601b32bf47b56db28f4bac3fbfc15d810b01 Mon Sep 17 00:00:00 2001 From: bluemonk Date: Sun, 27 Jul 2014 13:54:02 +0200 Subject: clean up Rakefile from jeweler --- Rakefile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) 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| -- cgit v1.2.1 From 00a4a33f895b7c1e93f5ddf604ee620aea654103 Mon Sep 17 00:00:00 2001 From: bluemonk Date: Sun, 27 Jul 2014 14:06:28 +0200 Subject: Bump to 0.1.0 --- lib/ipaddress/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ipaddress/version.rb b/lib/ipaddress/version.rb index 87a4585..97b4995 100644 --- a/lib/ipaddress/version.rb +++ b/lib/ipaddress/version.rb @@ -1,3 +1,3 @@ module Ipaddress - VERSION = "0.0.1" + VERSION = "0.1.0" end -- cgit v1.2.1 From 069ff36f87a20c4261f0e7cc0f4147d7d446da4a Mon Sep 17 00:00:00 2001 From: bluemonk Date: Sun, 27 Jul 2014 14:10:46 +0200 Subject: Version file adjusted to 0.8.0 --- lib/ipaddress/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ipaddress/version.rb b/lib/ipaddress/version.rb index 97b4995..73aae68 100644 --- a/lib/ipaddress/version.rb +++ b/lib/ipaddress/version.rb @@ -1,3 +1,3 @@ module Ipaddress - VERSION = "0.1.0" + VERSION = "0.8.0" end -- cgit v1.2.1