akaer 1.0.0 → 1.5.0

data/.gitignore

@@ -1,21 +1,6 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-# RubyMine
-.idea/
+Gemfile.lock
+tester.rb
+coverage/
+pkg/
+.idea/
+.yardoc/

data/.yardopts

@@ -1 +1 @@
---exclude lib/devdnsd/patches/.+ --exclude utils/ -m markdown
+-m markdown

data/Gemfile.lock

@@ -1,16 +1,15 @@
 PATH
   remote: .
   specs:
-    akaer (1.0.0)
-      bovem (>= 0.5.0)
-      gli (~> 1.6.0)
+    akaer (1.5.0)
+      mamertes (>= 1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -18,31 +17,33 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.7)
-      activesupport (= 3.2.7)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activesupport (3.2.7)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    bovem (0.6.0)
+    bovem (1.1.0)
       lazier (~> 1.0)
-      rainbow (~> 1.1.0)
+      open4 (~> 1.3.0)
     builder (3.0.0)
     coderay (1.0.7)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    github-markup (0.7.2)
-    gli (1.6.0)
+    github-markup (0.7.4)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.4)
-    lazier (1.0.1)
+    json (1.7.5)
+    lazier (1.0.3)
       actionpack (~> 3.0)
       json (~> 1.7.0)
       tzinfo (~> 0.3.0)
+    mamertes (1.1.0)
+      bovem (~> 1.1.0)
     method_source (0.8)
     multi_json (1.3.6)
+    open4 (1.3.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -52,17 +53,16 @@ GEM
       rack (>= 0.4)
     rack-test (0.6.1)
       rack (>= 1.0)
-    rainbow (1.1.4)
     rake (0.9.2.2)
     redcarpet (2.1.1)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.0)
+    rspec-mocks (2.11.2)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)

data/akaer.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("bovem", ">= 0.5.0")
-  gem.add_dependency("gli", "~> 1.6.0")
+  gem.add_dependency("mamertes", ">= 1.1.0")
 
   gem.add_development_dependency("rspec", "~> 2.11.0")
   gem.add_development_dependency("rake", "~> 0.9.0")
@@ -31,6 +30,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("yard", "~> 0.8.0")
   gem.add_development_dependency("redcarpet", "~> 2.1.0")
   gem.add_development_dependency("github-markup", "~> 0.7.0")
-end
-
-
+end

data/bin/akaer

@@ -6,86 +6,45 @@
 
 require "rubygems"
 require "akaer"
-require "gli"
 
-include GLI
-
-program_desc("A small utility to add aliases to network interfaces.")
-version(Akaer::Version::STRING)
-
-desc("The default interface to manage.")
-default_value("lo0")
-arg_name("INTERFACE")
-flag(:i, :interface)
-
-desc("The default list of aliases to add.")
-default_value([])
-arg_name("ADDRESSES")
-flag(:A, :addresses)
-
-desc("The starting address for sequential aliases.")
-default_value("10.0.0.1")
-arg_name("ADDRESS")
-flag(:s, :"start-address")
-
-desc("The number of aliases to add.")
-default_value(5)
-arg_name("ALIASES")
-flag(:S, :aliases)
-
-desc("The command to run for adding an alias.")
-default_value("sudo ifconfig @INTERFACE@ alias @ALIAS@")
-arg_name("COMMAND")
-flag(:c, :"add-command")
-
-desc("The command to run for adding an alias.")
-default_value("sudo ifconfig @INTERFACE@ -alias @ALIAS@")
-arg_name("COMMAND")
-flag(:C, :"remove-command")
-
-desc("The default log file.")
-default_value("STDOUT")
-arg_name("LOG")
-flag([:l, :log])
-
-desc("The default log level. Valid values are from 0 to 5 where 0 means \"all messages\".")
-default_value(1)
-arg_name("LEVEL")
-flag([:L, :"log-level"])
-
-desc("Only show which modifications will be done")
-switch([:n, :"dry-run"])
-
-desc("Do not show any message.")
-switch([:q, :quiet])
-
-desc("Add aliases.")
-command [:a, :add] do |c|
-  c.action do |globals, locals, args|
-    Akaer::Application.instance(globals, locals, args).action_add()
+Mamertes.App do
+  name "Akaer"
+  description "A small utility to add aliases to network interfaces."
+  version Akaer::Version::STRING
+
+  option "configuration", [], {:help => "The configuration file to use. Default is \"~/.akaer_config\".", :default => "~/.akaer_config"}
+  option "interface", [], {:help => "The default interface to manage. Default is \"lo0\".", :default => "lo0"}
+  option "addresses", [], {:type => Array, :help => "The default list of aliases to add. Overrides sequential list"}
+  option "start-address", [], {:help => "The starting address for sequential aliases. Default is \"10.0.0.1\".", :default => "10.0.0.1", :meta => "ADDRESS"}
+  option "aliases", [:S], {:type => Integer, :help => "The number of aliases to add. Default is 5.", :default => 5}
+  option "add-command", [:A], {:help => "The command to run for adding an alias. Default is \"sudo ifconfig @INTERFACE@ alias @ALIAS@\".", :default => "sudo ifconfig @INTERFACE@ alias @ALIAS@", :meta => "COMMAND"}
+  option "remove-command", [:R], {:help => "The command to run for removing an alias. Default is \"sudo ifconfig @INTERFACE@ -alias @ALIAS@\".", :default => "sudo ifconfig @INTERFACE@ -alias @ALIAS@", :meta => "COMMAND"}
+  option "log-file", [], {:help => "The default log file. Default is standard output.", :default => "STDOUT", :meta => "FILE"}
+  option "log-level", [:L], {:type => Integer, :help => "The default log level. Valid values are from 0 to 5 where 0 means \"all messages\". Default is 1.", :default => 1, :meta => "LEVEL"}
+  option "dry-run", [:n], {:help => "Only show which modifications will be done."}
+  option "quiet", [], {:help => "Do not show any message."}
+
+  command :add do
+    description "Adds aliases."
+    action { |command| Akaer::Application.instance(command).action_add() }
   end
-end
 
-desc("Remove aliases.")
-command [:r, :remove] do |c|
-  c.action do |globals, locals, args|
-    Akaer::Application.instance(globals, locals, args).action_remove()
+  command :remove do
+    description "Removes aliases."
+    action { |command| Akaer::Application.instance(command).action_remove() }
   end
-end
 
-desc("Install the application for autolaunch.")
-command [:i, :install] do |c|
-  c.action do |globals, locals, args|
-    Akaer::Application.instance(globals, locals, args).action_install()
+  command :install do
+    description "Installs the application to autolaunch."
+    action { |command| Akaer::Application.instance(command).action_install() }
   end
-end
 
-desc("Uninstall the application from autolaunch.")
-command [:u, :uninstall] do |c|
-  c.action do |globals, locals, args|
-    Akaer::Application.instance(globals, locals, args).action_uninstall()
+  command :uninstall do
+    description "Uninstalls the application from autolaunch."
+    action { |command| Akaer::Application.instance(command).action_uninstall() }
   end
-end
 
-ARGV << "help" if ARGV.length == 0
-exit(GLI.run(ARGV))
+  action do |command|
+    self.commands["add"].execute(ARGV)
+  end
+end