marhan_cli 0.0.2 → 0.0.5

data/.gitignore

@@ -17,4 +17,8 @@ test/version_tmp
 tmp
 
 # Ruby Mine
-.idea
+.idea
+
+# vim
+*.swp
+

data/Changelog.md

@@ -1,9 +1,21 @@
 ## v0.0.1
 
 * Initial release
-* Copying of ssh id file into the ~/.ssh/authorized_keys of a remote machine. (command: add-ssh-key)
+* Copy the ssh id file into the ~/.ssh/authorized_keys of a remote machine. (command => add-ssh-key)
 
 ## v0.0.2
 
-* Output improvement. (command: add-ssh-key)
+* Output improved. (command => add-ssh-key)
+
+## v0.0.4
+
+* Retrieves the external ip address from the world wide web. (command => my-net-ip)
+
+## v0.0.5
+
+* Add MarhanCli command list as default task list to Thor.
+* Introduce namespaces to commands. Building Groups with the namespaces 'web' and 'net'.
+* Command names renamed:
+    **my-net-ip** renamed to **web:my-ip**
+    **add-ssh-key** renamed to **net:add-ssh-key**
 

data/README.md

@@ -1,6 +1,6 @@
 # MarhanCli
 
-TODO: Write a gem description
+This gem is a toolset my my own needs.
 
 ## Installation
 

data/bin/mcli

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require "marhan_cli"
-MarhanCli::Cli.start
+MarhanCli.start

data/lib/marhan_cli.rb

@@ -1,6 +1,26 @@
-require "marhan_cli/cli"
+require 'thor'
+require 'thor/runner'
 
 module MarhanCli
-  #noop
+
+  def self.start
+    require_commands
+    run_thor
+  end
+
+  private
+
+  def self.require_commands
+    path_to_commands = File.expand_path '../marhan_cli/commands/*.rb', __FILE__
+    Dir[path_to_commands].each do |f|
+      require f
+    end
+  end
+
+  def self.run_thor
+    Thor.default_task 'list'
+    Thor::Runner.start
+  end
+
 end
 

data/lib/marhan_cli/command.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require "thor"
+
+module MarhanCli
+  class Command < Thor
+    include Thor::Actions
+
+  end
+end

data/lib/marhan_cli/commands/network.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+require 'marhan_cli/server/remote_machine'
+require 'marhan_cli/command'
+
+module MarhanCli
+  class Network < MarhanCli::Command
+
+    namespace :net
+
+    desc "net:add-ssh-key", "Copies public ssh id into authorized_keys"
+
+    method_option :user,
+                  :type => :string,
+                  :aliases => "-u",
+                  :desc => "Name of user on remote machine"
+
+    method_option :host,
+                  :type => :string,
+                  :aliases => "-h",
+                  :desc => "Name of remote machine"
+
+    method_option :port,
+                  :type => :numeric,
+                  :aliases => "-p",
+                  :default => 22,
+                  :desc => "Port of remote machine"
+
+    method_option :file,
+                  :type => :string,
+                  :aliases => "-f",
+                  :default => "~/.ssh/id_rsa.pub",
+                  :desc => "Path of id file"
+
+    def add_ssh_key
+      host = options[:host] || get_option(:host)
+      user = options[:user] || get_option(:user)
+      password = options[:password] || get_option(:password)
+      id_file = options[:file]
+      port = options[:port]
+
+      remote_machine = RemoteMachine.new(host, port)
+      remote_machine.add_id_to_authorized_keys(user, password, id_file)
+      say "successfully copied #{id_file} to #{host}", :green
+    rescue Exception => e
+      say "copying of id file to remote machine failed: #{e}", :red
+      exit(1)
+    end
+
+    protected
+
+    def get_option(option)
+      value = ask("Please enter #{option}:")
+      raise Thor::Error, "You must enter a value for that field." if value.empty?
+      value
+    end
+  end
+end

data/lib/marhan_cli/commands/web.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+require 'net/http'
+require 'marhan_cli/command'
+
+module MarhanCli
+  class Web < MarhanCli::Command
+
+    namespace :web
+
+    desc "web:my-ip", "Gives out the external IP from the world wide web"
+
+    def my_ip
+      uri = URI('http://checkip.dyndns.org')
+      response = Net::HTTP.get(uri)
+      ip_address = /[0-9\.]+/.match(response)
+      say("Your public IP is: #{ip_address}", :blue)
+    end
+
+  end
+end

data/lib/marhan_cli/{cli/server → server}/remote_machine.rb

@@ -1,5 +1,5 @@
 require 'net/ssh'
-require 'marhan_cli/cli/helper/constraint'
+require 'marhan_cli/helper/constraint'
 
 module MarhanCli
   class RemoteMachine

data/lib/marhan_cli/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module MarhanCli
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marhan_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,11 +59,12 @@ files:
 - Rakefile
 - bin/mcli
 - lib/marhan_cli.rb
-- lib/marhan_cli/cli.rb
-- lib/marhan_cli/cli/commands/server.rb
-- lib/marhan_cli/cli/helper/constraint.rb
-- lib/marhan_cli/cli/server/errors.rb
-- lib/marhan_cli/cli/server/remote_machine.rb
+- lib/marhan_cli/command.rb
+- lib/marhan_cli/commands/network.rb
+- lib/marhan_cli/commands/web.rb
+- lib/marhan_cli/helper/constraint.rb
+- lib/marhan_cli/server/errors.rb
+- lib/marhan_cli/server/remote_machine.rb
 - lib/marhan_cli/version.rb
 - marhan_cli.gemspec
 homepage: https://github.com/marhan/marhan_cli

data/lib/marhan_cli/cli.rb

@@ -1,10 +0,0 @@
-require "thor"
-require 'marhan_cli/cli/server/remote_machine'
-
-module MarhanCli
-  class Cli < Thor
-
-  end
-end
-
-require "marhan_cli/cli/commands/server"

data/lib/marhan_cli/cli/commands/server.rb

@@ -1,33 +0,0 @@
-module MarhanCli
-  class Cli
-    include Thor::Actions
-
-    desc "add-ssh-key", "Copies public ssh id into authorized_keys"
-    method_option :user, :type => :string, :aliases => "-u", :desc => "Name of user on remote machine"
-    method_option :host, :type => :string, :aliases => "-h", :desc => "Name of remote machine"
-    method_option :port, :type => :numeric, :aliases => "-p", :default => 22, :desc => "Port of remote machine"
-    method_option :file, :type => :string, :aliases => "-f", :default => "~/.ssh/id_rsa.pub", :desc => "Path of id file"
-
-    def add_ssh_key
-      host = options[:host] || get_option(:host)
-      user = options[:user] || get_option(:user)
-      password = options[:password] || get_option(:password)
-      id_file = options[:file]
-      port = options[:port]
-
-      remote_machine = RemoteMachine.new(host, port)
-      remote_machine.add_id_to_authorized_keys(user, password, id_file)
-      say "successfully copied #{id_file} to #{host}", :green
-    rescue Exception => e
-      say "copying of id file to remote machine failed: #{e}", :red
-    end
-
-    protected
-
-    def get_option(option)
-      value = ask("Please enter #{option}:")
-      raise Thor::Error, "You must enter a value for that field." if value.empty?
-      value
-    end
-  end
-end