ona 0.1.26 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.26
+0.2.0

data/bin/ona

@@ -13,20 +13,10 @@ eval File.read 'Onafile'
 cli = Ona::Cli.new(stack)
 
 loop do
-  line = Readline.readline('Ona> ', true)
+  line = Readline.readline("Ona> ", true)
   if (line == 'quit') || (line == 'exit')
     puts 'bye.'
     break
   end
-  cli.ls if line == 'ls'
-  cli.help if line == 'help'
-  cli.show line if line =~ /show/
-  cli.setup line if line =~ /setup/
-  cli.deploy line if line =~ /deploy/
-  cli.ssh_root line if line =~ /ssh#/
-  cli.ssh_deploy line if line =~ /ssh /
-  cli.http line if line =~ /http/
-  cli.key line if line =~ /key /
-  cli.keys if line =~ /keys/
-  cli.rake line if line =~ /rake /
+  cli.parse(line)
 end

data/lib/ona.rb

@@ -1,3 +1,4 @@
+require 'ona_cli'
 require 'ona_stack'
 require 'ona_server'
-require 'ona_cli'
+require 'ona_instructions'

data/lib/ona_cli.rb

@@ -2,12 +2,62 @@ module Ona
 
   class Cli
 
+    TRANSLATION = {
+      'show'   => { :method => :show,      :id_required => true   },
+      'setup'  => { :method => :setup,     :id_required => true   },
+      'deploy' => { :method => :deploy,    :id_required => true   },
+      'ssh#'   => { :method => :ssh_root,  :id_required => true   },
+      'ssh'    => { :method => :ssh_deploy,:id_required => true   },
+      'http'   => { :method => :http,      :id_required => true   },
+      'key'    => { :method => :key,       :id_required => true   },
+      'keys'   => { :method => :keys,      :id_required => true   },
+      'rake'   => { :method => :rake,      :id_required => true   },
+      'ls'     => { :method => :ls,        :id_required => false  },
+      'help'   => { :method => :help,      :id_required => false  },
+    }
+
     def initialize(stack)
-      @stack = stack
+      @stack        = stack
+      @instructions = Ona::Instructions.new(/[a-z]+[#]*/, /\d+/)
     end
 
-    def selected_servers string
-      @stack.find_all(*string.scan(/\d+/).map { |id| id.to_i })
+    def parse command_string
+      # Handle this separately for now.
+      return run_instruction('ls', 0)   if command_string == 'ls'
+      return run_instruction('help', 0) if command_string == 'help'
+
+      @instructions.define_command_string(command_string)
+      group = @instructions.group_targets_by_instruction
+      copy  = group.dup
+      copy.pop
+
+      # Only last group has ids?
+      if copy.all? { |x| x.values == [[]] }
+        @instructions.instructions.each do |instruction|
+          @instructions.targets.each do |target|
+            run_instruction instruction, target
+          end
+        end
+        return
+      end
+
+      # Run by group.
+      group.each do |hash|
+        instruction, targets = hash.to_a[0][0], hash.to_a[0][1]
+        targets.each do |target|
+          run_instruction instruction, target
+        end
+      end
+    end
+
+    def run_instruction instruction, target
+      return unless TRANSLATION.keys.include?(instruction)
+      hash = TRANSLATION[instruction]
+      cmd  = "#{TRANSLATION[instruction][:method]}"
+      if (hash[:id_required])
+        cmd << "(#{target.to_i})"
+      end
+      eval cmd
     end
 
     def help
@@ -37,21 +87,21 @@ module Ona
       "
     end
 
-    def http string
-      selected_servers(string).each do |server|
+    def http server_id
+      @stack.find_all(server_id).each do |server|
         system server.to_http
       end
     end
 
-    def key string
-      selected_servers(string).each do |server|
+    def key server_id
+      @stack.find_all(server_id).each do |server|
         puts 'Setting up key for root'
         system server.setup_ssh
       end
     end
 
-    def show string
-      selected_servers(string).each do |server|
+    def show server_id
+      @stack.find_all(server_id).each do |server|
         puts server.to_s
       end
     end
@@ -62,20 +112,20 @@ module Ona
       end
     end
 
-    def ssh_deploy string
-      selected_servers(string).each do |server|
+    def ssh_deploy server_id
+      @stack.find_all(server_id).each do |server|
         system server.to_ssh 'deploy'
       end
     end
 
-    def ssh_root string
-      selected_servers(string).each do |server|
+    def ssh_root server_id
+      @stack.find_all(server_id).each do |server|
         system server.to_ssh 'root'
       end
     end
 
-    def deploy string
-      selected_servers(string).each do |server|
+    def deploy server_id
+      @stack.find_all(server_id).each do |server|
         prompt_for_continuation server
         system server.say_sure_to_deploy
         line = gets
@@ -85,9 +135,9 @@ module Ona
       end
     end
 
-    def setup string
-      key string
-      selected_servers(string).each do |server|
+    def setup server_id
+      key server_id
+      @stack.find_all(server_id).each do |server|
         prompt_for_continuation server
         system server.say_sure_to_setup
         line = gets
@@ -97,8 +147,8 @@ module Ona
       end
     end
 
-    def rake string
-      selected_servers(string).each do |server|
+    def rake server_id
+      @stack.find_all(server_id).each do |server|
         server.to_s
         server.rake.each do |task|
           puts task

data/lib/ona_instructions.rb

@@ -0,0 +1,43 @@
+module Ona
+
+  class Instructions
+
+    def initialize instruction_matcher, target_matcher
+      define_instruction_matcher instruction_matcher
+      define_target_matcher target_matcher
+    end
+
+    def define_command_string command_string
+      @command_string = command_string
+    end
+
+    def define_instruction_matcher matcher_regex
+      @instruction_matcher = matcher_regex
+    end
+
+    def define_target_matcher matcher_regex
+      @target_matcher = matcher_regex
+    end
+
+    def targets
+      @command_string.scan(@target_matcher)
+    end
+
+    def instructions
+      @command_string.scan(@instruction_matcher)
+    end
+
+    def group_targets_by_instruction
+      group  = []
+      chunks = (@command_string.split(@instruction_matcher) - [""])
+      return group if chunks.size != instructions.size
+      chunks.each_with_index do |instruction_targets, index|
+        instruction_targets = (instruction_targets.scan(@target_matcher) - [])
+        group << { instructions[index] => instruction_targets }
+      end
+      group
+    end
+
+  end
+
+end

data/ona.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ona}
-  s.version = "0.1.26"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kazuyoshi tlacaelel"]
-  s.date = %q{2010-09-01}
+  s.date = %q{2011-10-27}
   s.default_executable = %q{ona}
   s.description = %q{Simple shell for deployment.}
   s.email = %q{kazu.dev@gmail.com}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "bin/ona",
      "lib/ona.rb",
      "lib/ona_cli.rb",
+     "lib/ona_instructions.rb",
      "lib/ona_server.rb",
      "lib/ona_stack.rb",
      "ona.gemspec",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ona
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 26
-  version: 0.1.26
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - kazuyoshi tlacaelel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -05:00
+date: 2011-10-27 00:00:00 -05:00
 default_executable: ona
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - bin/ona
 - lib/ona.rb
 - lib/ona_cli.rb
+- lib/ona_instructions.rb
 - lib/ona_server.rb
 - lib/ona_stack.rb
 - ona.gemspec