ona 0.3.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 00cac1d1f46370554c113bd8046a84cd79da23f74531424140ffd1445c927374
+  data.tar.gz: db80fffc3243a7ad43363d292f27b7d7e855693cd19d1cfca9fe201a236cf251
+SHA512:
+  metadata.gz: 5e59d548206b8e69028e9bb5c337f4cd3043f46e00e2a21a79b5aae8c9cbee64cd2c8cc4068bfcfdf735d407cef5388398bef5fd073249ad1104b84b598778d9
+  data.tar.gz: '0604507116913163d44be4983b2efa1e09175c965c17c593694b4061799824b8f972344fcc7e591de2f9def4cd9f99725fc3f039e8b784c9371420ef48699b92'

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rake', '0.8.7'
-gem 'jeweler'
-
+# gem 'rake', '0.8.7'
+# gem 'jeweler'
+# 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/ona

@@ -8,15 +8,7 @@ unless File.exists? 'Onafile'
   abort 'Please create a file named:[Onafile] to start the shell.'
 end
 
-stack = Ona::Stack.new
 eval File.read 'Onafile'
-cli = Ona::Cli.new(stack)
 
-loop do
-  line = Readline.readline("Ona> ", true)
-  if (line == 'quit') || (line == 'exit')
-    puts 'bye.'
-    break
-  end
-  cli.parse(line)
-end
+Ona.main
+

data/lib/ona.rb

@@ -1,4 +1,164 @@
-require 'ona_cli'
-require 'ona_stack'
-require 'ona_server'
-require 'ona_instructions'
+#!/usr/bin/env ruby
+
+require 'ostruct'
+require 'readline'
+require 'isna'
+
+class Ona
+  def self.resource(name, attributes)
+    @resources ||= {}
+    @resources[name] ||= {}
+    @resources[name][:class] = Struct.new(*attributes)
+    @resources[name][:entries] = []
+    @resources[name][:handlers] = []
+    @resources[name][:attributes] = attributes
+    _create_to_s_method(@resources[name])
+    nil
+  end
+  def self._create_to_s_method(resource)
+    attribute_sizes = resource[:attributes].map do |attribute|
+      attribute.to_s.size
+    end
+    resource[:class].send(:define_method, :to_s) do
+      max_attribute_length = attribute_sizes.sort.last + 4
+      resource[:attributes].sort.map do |attribute|
+        key = attribute.to_s.rjust(max_attribute_length, ' ')
+        "#{key.to_ansi.green.to_s} : #{send(attribute)}"
+      end * "\n"
+    end
+  end
+  def self.register(name, &block)
+    object = @resources[name][:class].new
+    block.call(object)
+    @resources[name][:entries].push(object)
+    nil
+  end
+  def self.action(hash, &block)
+    unless hash[:find]
+      _generic_action(hash, &block)
+      return
+    end
+    unless hash[:token]
+      $stderr.puts "No token for: #{hash.inspect}"
+      exit 1
+    end
+    _single_action(hash, &block)
+  end
+  def self._generic_action(hash, &block)
+    hash[:block] = block
+    @resources[hash[:resource]][:handlers].push(hash)
+    nil
+  end
+  def self._single_action(hash, &block)
+    Ona._generic_action(hash) do |resources, command, regex|
+      wanted_id = hash[:token].call(command.scan(regex))
+      wanted_id = wanted_id.to_i
+      resources.each_with_index do |array, id|
+        next if id != wanted_id
+        block.call(array, id)
+      end
+    end
+  end
+  def self.run(command)
+    @resources.each do |name, resource|
+      resource[:handlers].each do |handler|
+        next unless handler[:regex].match(command)
+        handler[:block].call(resource[:entries], command, handler[:regex])
+        return
+      end
+    end
+    nil
+  end
+  def self.prompt=(string)
+    @prompt = string
+  end
+  def self.prompt
+    @prompt
+  end
+  def self.main(use_defaults = true)
+    defaults if use_defaults
+    _prompt = (prompt || 'Ona').to_ansi.cyan.to_s + '> '
+    while input = Readline.readline(_prompt, true)
+	  Ona.run(input)
+    end
+    puts ''
+  end
+  def self._get_max_regex_length
+    max = 0
+    @resources.each do |name, resource|
+      resource[:handlers].each do |handler|
+        if max < handler[:regex].inspect.size
+          max = handler[:regex].inspect.size
+        end
+      end
+    end
+    max
+  end
+  def self._get_max_example_length
+    max = 0
+    @resources.each do |name, resource|
+      resource[:handlers].each do |handler|
+        if max < handler[:example].size
+          max = handler[:example].size
+        end
+      end
+    end
+    max
+  end
+  def self._get_max_name_length
+    max = 0
+    @resources.each do |name, resource|
+      if max < name.size
+        max = name.size
+      end
+    end
+    max
+  end
+  def self.help
+    @resources.each do |name, resource|
+      pretty_name = "[#{name}]".to_s.rjust(_get_max_name_length + 2, ' ')
+      pretty_name = pretty_name.to_ansi.cyan.to_s
+    resource[:handlers].sort do |a, b|
+      a[:example] <=> b[:example]
+    end.each do |handler|
+        pretty_regex = handler[:regex].inspect.ljust(_get_max_regex_length, ' ')
+        pretty_regex = pretty_regex.to_s.to_ansi.pink.to_s
+        pretty_example = handler[:example].ljust(_get_max_example_length, ' ')
+        pretty_example = pretty_example.to_s.to_ansi.yellow.to_s
+        puts "#{pretty_name} #{pretty_example} #{handler[:text]}"
+      end
+    end
+  end
+  def self.defaults
+    Ona.resource(:any, [:empty])
+
+    Ona.action(
+      :regex    => /(^)(quit|exit)($)/,
+      :resource => :any,
+      :text     => 'Exit this program.',
+      :example  => 'quit'
+    ) do |resource, command, regex|
+      puts 'bye.'
+      exit 0
+    end
+
+    Ona.action(
+      :regex    => /^help$/,
+      :resource => :any,
+      :text     => 'Print help.',
+      :example  => 'help'
+    ) do |resource, command, regex|
+      Ona.help
+    end
+  end
+  def self.confirm(text, expected)
+    puts ''
+    puts "# " + " #{text} ".to_ansi.white.red_background.to_s
+    puts "# " + '=' * 78
+    puts "Type [#{expected.to_ansi.green.to_s}] to continue. or anything else to skip."
+    print 'What to do? >'
+    input = gets.chomp
+    input == expected
+  end
+end
+

data/ona.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ona"
-  s.version = "0.3.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kazuyoshi tlacaelel"]
@@ -27,10 +27,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/ona",
     "lib/ona.rb",
-    "lib/ona_cli.rb",
-    "lib/ona_instructions.rb",
-    "lib/ona_server.rb",
-    "lib/ona_stack.rb",
     "ona.gemspec",
     "test/helper.rb",
     "test/test_ona.rb"

metadata

@@ -1,77 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ona
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - kazuyoshi tlacaelel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-12-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.7
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: jeweler
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple shell for deployment.
 email: kazu.dev@gmail.com
-executables: 
+executables:
 - ona
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- .document
+files:
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -80,45 +70,29 @@ files:
 - VERSION
 - bin/ona
 - lib/ona.rb
-- lib/ona_cli.rb
-- lib/ona_instructions.rb
-- lib/ona_server.rb
-- lib/ona_stack.rb
 - ona.gemspec
 - test/helper.rb
 - test/test_ona.rb
 homepage: http://github.com/ktlacaelel/ona
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: Ona -- Deployment symplified.
 test_files: []
-

data/lib/ona_cli.rb

@@ -1,192 +0,0 @@
-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   },
-      'go'     => { :method => :go_deploy, :id_required => true   },
-      'go#'    => { :method => :go_root,   :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
-      @instructions = Ona::Instructions.new(/[a-z]+[#]*/, /\d+/)
-    end
-
-    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
-      puts "
-      Ona -- Deployment simplified.
-
-      deploy 1          # Deploy a specific server
-      exit              # Same as *quit*
-      go                # Go to server without opening a new window.
-      go#               # Same as go but do it as root.
-      help              # Show this help
-      http 1            # Open the server in default browser.
-      key 1             # Uploads my public ssh-key to remote server (root)
-      keys              # Uploads my public ssh-key to all servers (root)
-      ls                # Short list for available servers
-      quit              # Termintes the ona shell.
-      rake              # Shows rake tasks.
-      setup 1           # Upload ssh-keys and bootstrap server
-      show 1            # Detailed info for a specific server
-      ssh 1             # Open a ssh session as *deploy* on remote server (new window)
-      ssh# 1            # Open a ssh session as *root* to a remote server (new window)
-
-      --
-
-      Note: 1 is a server id, you can use many ids!
-
-      show 1 2 3        # Will display info for three servers.
-
-      "
-    end
-
-    def http server_id
-      @stack.find_all(server_id).each do |server|
-        system server.to_http
-      end
-    end
-
-    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 server_id
-      @stack.find_all(server_id).each do |server|
-        puts server.to_s
-      end
-    end
-
-    def ls
-      @stack.to_a.each do |server|
-        puts server.to_short_s
-      end
-    end
-
-    def ssh_deploy server_id
-      @stack.find_all(server_id).each do |server|
-        system server.to_ssh 'deploy'
-      end
-    end
-
-    def ssh_root server_id
-      @stack.find_all(server_id).each do |server|
-        system server.to_ssh 'root'
-      end
-    end
-
-    def go_deploy server_id
-      @stack.find_all(server_id).each do |server|
-        system server.to_go 'deploy'
-      end
-    end
-
-    def go_root server_id
-      @stack.find_all(server_id).each do |server|
-        system server.to_go 'deploy'
-      end
-    end
-
-    def deploy server_id
-      @stack.find_all(server_id).each do |server|
-        prompt_for_continuation server
-        system server.say_sure_to_deploy
-        line = gets
-        next unless line.chomp == 'yes'
-        system server.deploy
-        system server.say_deployed
-      end
-    end
-
-    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
-        next unless line.chomp == 'yes'
-        system server.bootstrap
-        system server.say_finished_setup
-      end
-    end
-
-    def rake server_id
-      @stack.find_all(server_id).each do |server|
-        server.to_s
-        server.rake.each do |task|
-          puts task
-        end
-      end
-    end
-
-    def keys
-      @stack.to_a.each do |server|
-        puts 'Setting up key for root'
-        system server.setup_ssh
-      end
-    end
-
-    protected
-
-    def prompt_for_continuation server
-      puts server.to_s
-      puts 'Type [yes] to continue. or anything else to skip.'
-      print 'What to do? >'
-    end
-
-  end
-
-end

data/lib/ona_instructions.rb

@@ -1,43 +0,0 @@
-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/lib/ona_server.rb

@@ -1,79 +0,0 @@
-module Ona
-
-  class Server
-
-    attr_accessor :id, :role, :ip, :pass, :desc, :dna
-
-    def load_block id, &block
-      @id = id
-      yield(self)
-    end
-
-    def setup_ssh
-      "rake upload_ssh_key server=root@#{ip} pass=#{pass} key=#{local_key}"
-    end
-
-    def say_deployed
-      "say #{desc} deployed"
-    end
-
-    def say_finished_setup
-      "say #{desc} setup terminated"
-    end
-
-    def say_sure_to_setup
-      "say 'Are you sure to setup #{desc}'"
-    end
-
-    def say_sure_to_deploy
-      "say 'Are you sure to deploy #{desc}'"
-    end
-
-    def bootstrap
-      "rake bootstrap server=root@#{ip}"
-    end
-
-    def deploy
-      "rake cook server=root@#{ip} dna=#{dna} instance_role=#{role}"
-    end
-
-    def to_ssh user
-      "open ssh://#{user}@#{ip}"
-    end
-
-    def to_go user
-      "ssh #{user}@#{ip}"
-    end
-
-    def to_http
-      "open http://#{ip}"
-    end
-
-    def to_short_s
-      "#{id}".ljust(5) + "#{desc}"
-    end
-
-    def to_s
-      "
-  #{id} - #{desc}
-
-      Id           #{id}
-      Ip           #{ip}
-      Dna          #{dna}
-      Role         #{role}
-      Password     #{pass}
-
-      "
-    end
-
-    def rake
-      [setup_ssh, bootstrap, deploy]
-    end
-
-    def local_key
-      File.join(ENV['HOME'], '.ssh/id_rsa.pub')
-    end
-
-  end
-
-end

data/lib/ona_stack.rb

@@ -1,39 +0,0 @@
-module Ona
-
-  class Stack
-
-    def initialize
-      @list = []
-      @id = 0
-    end
-
-    def append &block
-      @id += 1
-      server = Server.new
-      server.load_block(@id, &block)
-      @list << server
-    end
-
-    def find num
-      @list.each do |server|
-        return server if server.id == num
-      end
-      nil
-    end
-
-    def find_all *args
-      args.map { |id| find id }.compact
-    end
-
-    def exists? num
-      return false if find(num).nil?
-      true
-    end
-
-    def to_a
-      @list
-    end
-
-  end
-
-end