devdnsd 3.1.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b648c4b43870869cc0ca377f48c02ebeab6f1ac
-  data.tar.gz: 64dc8c2906f4a3527734422b859e42948826cdf1
+  metadata.gz: e86c63c0df9fb463d522f48bfb6bb1bba34ca264
+  data.tar.gz: e0d478ea1c12a89749ab6e7e1992d861bcc78a47
 SHA512:
-  metadata.gz: e5054c5973bc03b74ec5d260e208f63382b54f838b0f847f74078a42cdbbc3d372b2c858b91da79b6cd573d2ba15c91457e23d64e0bfde2a5c9430ab2ed6f6d8
-  data.tar.gz: 75adba2ac56d7ca682a55b833578d04d4f3a3f881b92c511cc9a314df80f4c9f6d3d489df0bc15cc77f2f90b67b70e22563fcba8e569961afb4c4cc22ddec1c5
+  metadata.gz: 7b241da3f9e2ce257d4ebe5865f97f5b78cf697f9015f5f017c9547fc9928d9b7eef9af51f20a95ec6854eb73e6880498d431f7ea68f90818a6a2c22afcbe034
+  data.tar.gz: 46fc7084e593df3e1ecf7bd23cbd973af2946f7bc575a7dd811c674b37775d6aad4f1749b21792bfe48e8f93ec5e36be351ed2296a648726ab78538f44a9b2bf

data/.gitignore

@@ -2,7 +2,7 @@ Gemfile.lock
 tester.rb
 coverage/
 pkg/
-utils/
+tmp/
 .idea/
 .yardoc/
-.bundle/
+.bundle

data/.rubocop.yml

@@ -0,0 +1,82 @@
+#
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Include:
+    - "*/**/.rb"
+    - "config.ru"
+    - "Rakefile"
+    - "Gemfile"
+  Exclude:
+    - "config/**/*"
+    - "db/**/*"
+    - "spec/**/*"
+
+Alias:
+  Enabled: false
+
+AsciiComments:
+  Enabled: false
+
+BracesAroundHashParameters:
+  Enabled: false
+
+CyclomaticComplexity:
+  Max: 15
+
+ClassLength:
+  Max: 150
+
+Documentation:
+  Enabled: false
+
+EachWithObject:
+  Enabled: false
+
+FormatString:
+  Enabled: false
+
+FrozenStringLiteralComment:
+  Enabled: false
+
+IndentationConsistency:
+  Enabled: false
+
+LineLength:
+  Max: 160
+
+MethodLength:
+  Max: 15
+
+ModuleLength:
+  Max: 200
+
+MultilineMethodCallIndentation:
+  Enabled: false
+
+ParameterLists:
+  Max: 8
+
+RegexpLiteral:
+  Enabled: false
+
+SignalException:
+  Enabled: false
+
+SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+StringLiterals:
+  Enabled: false
+
+StringLiteralsInInterpolation:
+  Enabled: false
+
+StringReplacement:
+  Enabled: false
+
+WordArray:
+  Enabled: false

data/.travis-gemfile

@@ -9,13 +9,7 @@ source "http://rubygems.org"
 gemspec
 
 # Testing
-gem "rspec", "~> 2.14.1"
-gem "rake", "~> 10.1.1"
-gem "simplecov", ">= 0.8.2"
-gem "coveralls", ">= 0.7.0", require: false
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end
+gem "rspec", "~> 3.4"
+gem "rake", "~> 11.0"
+gem "simplecov", "~> 0.11"
+gem "coveralls", "~> 0.8", require: false

data/.travis.yml

@@ -1,9 +1,15 @@
+#
+# This file is part of the bovem gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - rbx
-script: bundle exec rake spec:coverage
+  - 2.3.0
+script: bundle exec rake spec:ci
 gemfile: .travis-gemfile
 notifications:
-  email: false
+  email: false
+addons:
+  code_climate:
+    repo_token: bac83dc8b02f38cc87f2d3b6dab710a3b6c80cca3772687f5a6c3b8697dce9c3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 4.0.0 / 2016-03-30
+
+* Refactored `DevDNSd::Application`.
+* Changed signatures of `DevDNSd::Rule.create` and `DevDNSd::Rule#initialize`.
+* Changed signatures of `DevDNSd::Configuration.add_rule`.
+* Removed `DevDNSd::Aliases#is_ipv4?` and `DevDNSd::Aliases#is_ipv6?` aliases.
+* Dropped support for Ruby < 2.3.
+* Replaced `rexec` with `process-daemon`.
+* Updated dependencies.
+* Linted code.
+
 ### 3.1.2 / 2014-03-29
 
 * Minor fixes.

data/Gemfile

@@ -9,13 +9,14 @@ source "http://rubygems.org"
 gemspec
 
 # Testing
-gem "rspec", "~> 2.14.1"
-gem "rake", "~> 10.1.1"
+gem "rspec", "~> 3.4"
+gem "rake", "~> 11.0"
 
 # Documentation
-gem "simplecov", ">= 0.8.2"
-gem "coveralls", ">= 0.7.0", require: false
-gem "pry", ">= 0"
-gem "yard", ">= 0.8.7.3"
-gem "kramdown", ">= 1.3.2"
-gem "github-markup", ">= 1.0.3"
+gem "simplecov", "~> 0.11"
+gem "coveralls", "~> 0.8", require: false
+gem "pry", "~> 0.10"
+gem "yard", "~> 0.8"
+gem "kramdown", "~> 1.10"
+gem "github-markup", "~> 1.4"
+gem "rubocop", "~> 0.39"

data/README.md

@@ -5,11 +5,10 @@
 [![Build Status](https://secure.travis-ci.org/ShogunPanda/devdnsd.png?branch=master)](http://travis-ci.org/ShogunPanda/devdnsd)
 [![Code Climate](https://codeclimate.com/github/ShogunPanda/devdnsd.png)](https://codeclimate.com/github/ShogunPanda/devdnsd)
 [![Coverage Status](https://coveralls.io/repos/ShogunPanda/devdnsd/badge.png)](https://coveralls.io/r/ShogunPanda/devdnsd)
-[![Bitdeli Trend](https://d2weczhvl823v0.cloudfront.net/ShogunPanda/devdnsd/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 A small DNS server to enable local .dev domain resolution.
 
-http://sw.cow.tc/devdnsd
+http://sw.cowtech.it/devdnsd
 
 http://rdoc.info/gems/devdnsd
 
@@ -36,8 +35,8 @@ Of course, DevDNSd is inspired by [pow](https://github.com/37signals/pow), but i
 If you experience slowness in resolving host from clients (Chrome, curl etc.) when you don't specify the address type, make sure you have both a `A` and `AAAA` rules set for the same host, like this:
 
 ```ruby
-config.add_rule(/\.dev$/, "127.0.0.1")
-config.add_rule(/\.dev$/, "::1", :AAAA)
+config.add_rule(match: /\.dev$/, reply: "127.0.0.1")
+config.add_rule(match: /\.dev$/, reply: "::1", type: :AAAA)
 ```
 
 ## Advanced usage
@@ -95,7 +94,7 @@ You can, anyway, run the software as DNS server.
 
 ## Copyright
 
-This software have been made possible by the awesome job of [Samuel Williams](https://github.com/ioquatix), with his [RubyDNS](https://github.com/rubydns) and [RExec](https://github.com/rexec) gems.
+This software have been made possible by the awesome job of [Samuel Williams](https://github.com/ioquatix), with his [RubyDNS](https://github.com/rubydns) and [process-daemon](https://github.com/process-daemon) gems.
 
 Copyright (C) 2013 and above Shogun (shogun@cowtech.it).
 

data/Rakefile

@@ -7,23 +7,39 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+# Compatibility layer for Rake 11.0
+Rake.application.class.send(:alias_method, :last_comment, :last_description) unless Rake.application.respond_to?(:last_comment)
+
 RSpec::Core::RakeTask.new("spec")
-RSpec::Core::RakeTask.new("spec:coverage") { |t| t.ruby_opts = "-r./spec/coverage_helper" }
 
-desc "Generate the documentation"
+RSpec::Core::RakeTask.new("spec:coverage") do
+  ENV["COVERAGE"] = "true"
+end
+
+RSpec::Core::RakeTask.new("spec:ci") do
+  ENV["COVERAGE"] = "true"
+  ENV["NO_COLOR"] = "true"
+end
+
+desc "Performs linting of the code using rubocop"
+task "lint" do
+  Kernel.exec("rubocop -ED bin lib")
+end
+
+desc "Generates the documentation"
 task :docs do
   system("yardoc") || raise("Failed Execution of: yardoc")
 end
-
-desc "Get the current release version"
+  
+desc "Gets the current release version"
 task :version, :with_name do |_, args|
   gem = Bundler::GemHelper.instance.gemspec
   puts [args[:with_name] == "true" ? gem.name : nil, gem.version].compact.join("-")
 end
 
-desc "Prepare the release"
+desc "Prepares the release"
 task :prerelease => ["spec:coverage", "docs"] do
   ["git add -A", "git commit -am \"Version #{Bundler::GemHelper.instance.gemspec.version}\""].each do |cmd|
     system(cmd) || raise("Failed Execution of: #{cmd}")
   end
-end
+end

data/bin/devdnsd

@@ -5,94 +5,100 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require "rubygems"
+$:.unshift(File.absolute_path(File.dirname(__FILE__) + "/../lib/"))
 require "devdnsd"
 
 Bovem::Application.create do
-  localizer = Lazier::Localizer.new(:devdnsd, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../locales/")).i18n
+  i18n = Bovem::I18n.new(root: "devdnsd", path: ::Pathname.new(::File.dirname(__FILE__)).to_s + "/../locales/")
   name "DevDNSd"
-  description localizer.application_description
+  description i18n.application_description
   version DevDNSd::Version::STRING
 
-  option :configuration, [], {type: String, help: localizer.application_help_configuration, default: "~/.devdnsd/default.conf", meta: localizer.application_meta_file}
-  option :tld, [], {type: String, help: localizer.application_help_tld, default: "dev", meta: localizer.application_meta_domain}
-  option :port, [], {type: Integer, help: localizer.application_help_port, default: 7771, meta: localizer.application_meta_port}
-  option :pid_file, [:P, "pid-file"], {type: String, help: localizer.application_help_pid_file, default: "~/.devdnsd/daemon.pid", meta: localizer.application_meta_file}
-  option :log_file, [:l, "log-file"], {type: String, help: localizer.application_help_log_file, default: "~/.devdnsd/daemon.log", meta: localizer.application_meta_file}
-  option :log_level, [:L, "log-level"], {type: Integer, help: localizer.application_help_log_level, default: 1, meta: localizer.application_meta_level}
+  option :configuration, [], {type: String, help: i18n.application_help_configuration, default: "~/.devdnsd/default.conf", meta: i18n.application_meta_file}
+  option :tld, [], {type: String, help: i18n.application_help_tld, default: "dev", meta: i18n.application_meta_domain}
+  option :port, [], {type: Integer, help: i18n.application_help_port, default: 7771, meta: i18n.application_meta_port}
+  option :pid_file, [:P, "pid-file"], {type: String, help: i18n.application_help_pid_file, default: "~/.devdnsd/daemon.pid", meta: i18n.application_meta_file}
+  option :log_file, [:l, "log-file"], {type: String, help: i18n.application_help_log_file, default: "~/.devdnsd/daemon.log", meta: i18n.application_meta_file}
+  option :log_level, [:L, "log-level"], {type: Integer, help: i18n.application_help_log_level, default: 1, meta: i18n.application_meta_level}
 
   command :start do
-    description localizer.command_start
-    option :foreground, [:n, "foreground"], {help: localizer.application_help_foreground}
+    description i18n.command_start
+    option :foreground, [:n, "foreground"], {help: i18n.application_help_foreground}
     action { |command| DevDNSd::Application.instance(command).action_start }
   end
 
   command :status do
-    description localizer.command_status
-    action { |command|
+    description i18n.command_status
+    action do |command|
       command.application.options[:log_file].set("STDOUT")
       DevDNSd::Application.instance(command).action_status
-    }
+    end
   end
 
   command :stop do
-    description localizer.command_stop
+    description i18n.command_stop
     action { |command| DevDNSd::Application.instance(command).action_stop }
   end
 
   command :restart do
-    description localizer.command_restart
+    description i18n.command_restart
     action { |command| DevDNSd::Application.instance(command).action_restart }
   end
 
   command :install do
-    description localizer.command_install
-    action { |command|
+    description i18n.command_install
+    action do |command|
       command.application.options[:log_file].set("STDOUT")
       DevDNSd::Application.instance(command).action_install
-    }
+    end
   end
 
   command :uninstall do
-    description localizer.command_uninstall
-    action { |command|
+    description i18n.command_uninstall
+    action do |command|
       command.application.options[:log_file].set("STDOUT")
       DevDNSd::Application.instance(command).action_uninstall
-    }
+    end
   end
 
   command :clean do
-    description localizer.command_clean
-    action { |command|
+    description i18n.command_clean
+    action do |command|
       command.application.options[:log_file].set("STDOUT")
       app = DevDNSd::Application.instance(command)
       app.logger.warn(app.i18n.admin_privileges_warning)
       app.dns_update
-    }
+    end
   end
 
   command :aliases do
-    description localizer.command_aliases
-    option :interface, [], {type: String, help: localizer.application_help_interface, default: "lo0", meta: localizer.application_meta_interface}
-    option :addresses, [], {type: Array, help: localizer.application_help_addresses, meta: localizer.application_meta_addresses}
-    option :start_address, [:s, "start-address"], {type: String, help: localizer.application_help_start_address, default: "10.0.0.1", meta: localizer.application_meta_address}
-    option :aliases, [:S], {type: Integer, help: localizer.application_help_aliases, default: 5, meta: localizer.application_meta_aliases}
-    option :add_command, [:A, "add-command"], {type: String, help: localizer.application_help_add_command, default: "sudo ifconfig {{interface}} alias {{address}}", meta: localizer.application_meta_command}
-    option :remove_command, [:R, "remove-command"], {type: String, help: localizer.application_help_remove_command, default: "sudo ifconfig {{interface}} -alias {{address}}", meta: localizer.application_meta_command}
-    option :dry_run, [:n, "dry-run"], {help: localizer.application_help_dry_run}
+    description i18n.command_aliases
+    option :interface, [], {type: String, help: i18n.application_help_interface, default: "lo0", meta: i18n.application_meta_interface}
+    option :addresses, [], {type: Array, help: i18n.application_help_addresses, meta: i18n.application_meta_addresses}
+    option :start_address, [:s, "start-address"], {
+      type: String, help: i18n.application_help_start_address, default: "10.0.0.1", meta: i18n.application_meta_address
+    }
+    option :aliases, [:S], {type: Integer, help: i18n.application_help_aliases, default: 5, meta: i18n.application_meta_aliases}
+    option :add_command, [:A, "add-command"], {
+      type: String, help: i18n.application_help_add_command, default: "sudo ifconfig {{interface}} alias {{address}}", meta: i18n.application_meta_command
+    }
+    option :remove_command, [:R, "remove-command"], {
+      type: String, help: i18n.application_help_remove_command, default: "sudo ifconfig {{interface}} -alias {{address}}", meta: i18n.application_meta_command
+    }
+    option :dry_run, [:n, "dry-run"], {help: i18n.application_help_dry_run}
 
     command :add do
-      description localizer.command_add
+      description i18n.command_add
       action { |command| DevDNSd::Application.instance(command).action_add(command.parent.get_options) }
     end
 
     command :remove do
-      description localizer.command_remove
+      description i18n.command_remove
       action { |command| DevDNSd::Application.instance(command).action_remove(command.parent.get_options) }
     end
 
     action do |command|
-      self.commands["add"].execute(command.options[:dry_run].value)
+      commands["add"].execute(command.options[:dry_run].value)
     end
   end
 

data/config/devdnsd_config.sample

@@ -1,23 +1,23 @@
 config.log_file = "/tmp/devdnsd-test-log.log"
 
-config.add_rule("match_1.dev", "10.0.1.1")
+config.add_rule(match: "match_1.dev", reply: "10.0.1.1")
 
-config.add_rule("match_2.dev", "10.0.2.1", :MX)
+config.add_rule(match: "match_2.dev", reply: "10.0.2.1", type: :MX)
 
-config.add_rule("match_3.dev") do "10.0.3.1" end
+config.add_rule(match: "match_3.dev") do "10.0.3.1" end
 
-config.add_rule("match_4.dev", :CNAME) do "cowtech.it" end
+config.add_rule(match: "match_4.dev", type: :CNAME) do "cowtech.it" end
 
-config.add_rule(/match_5_(\d+)\.dev/, "ns.cowtech.it", :NS)
+config.add_rule(match: /match_5_(\d+)\.dev/, reply: "ns.cowtech.it", type: :NS)
 
-config.add_rule(/match_6_(\d+).dev/, "10.0.6.$1", :PTR)
+config.add_rule(match: /match_6_(\d+).dev/, reply: "10.0.6.$1", type: :PTR)
 
-config.add_rule(/match_7_(\d+).dev/) do "10.0.7.$1" end
+config.add_rule(match: /match_7_(\d+).dev/) do "10.0.7.$1" end
 
-config.add_rule(/match_8_(\d+).dev/, :PTR) do "10.0.8.$1" end
+config.add_rule(match: /match_8_(\d+).dev/, type: :PTR) do "10.0.8.$1" end
 
-config.add_rule("match_9.dev") do false end
+config.add_rule(match: "match_9.dev") do false end
 
-config.add_rule("match_10.dev", [:A, :MX]) do |match, type, transaction| type == :A ? "10.0.10.1" : "10.0.10.2" end
+config.add_rule(match: "match_10.dev", type: [:A, :MX]) do |match, type, transaction| type == :A ? "10.0.10.1" : "10.0.10.2" end
 
-config.add_rule("quit.dev") do DevDNSd::Application.quit end
+config.add_rule(match: "quit.dev") do DevDNSd::Application.quit end

data/devdnsd.gemspec

@@ -9,7 +9,7 @@ require "./lib/devdnsd/version"
 Gem::Specification.new do |gem|
   gem.name = "devdnsd"
   gem.version = DevDNSd::Version::STRING
-  gem.homepage = "http://sw.cow.tc/devdnsd"
+  gem.homepage = "http://sw.cowtech.it/devdnsd"
   gem.summary = %q{A small DNS server to enable local domain resolution.}
   gem.description = %q{A small DNS server to enable local domain resolution.}
   gem.rubyforge_project = "devdnsd"
@@ -23,12 +23,13 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 1.9.3"
+  gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_dependency("bovem", "~> 3.0.5")
-  gem.add_dependency("rubydns", "~> 0.7.0")
-  gem.add_dependency("mustache", "~> 0.99.5")
-  gem.add_dependency("plist", "~> 3.1.0")
+  gem.add_dependency("bovem", "~> 4.0")
+  gem.add_dependency("rubydns", "~> 1.0")
+  gem.add_dependency("process-daemon", "~> 1.0")
+  gem.add_dependency("mustache", "~> 1.0")
+  gem.add_dependency("plist", "~> 3.2")
 end