eftcmdr 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c026792651e7d592cd7e95b0cdbeba4b48a72a34
-  data.tar.gz: 90f7c70c580bfa46dcd83a809dc241a9115f77fc
+  metadata.gz: b9a6c7ff546d6168863233defa60377bcc43ec2d
+  data.tar.gz: 5bc174030b292200451da7b62842d4b9bd6e59ac
 SHA512:
-  metadata.gz: 12f6227308d8c61cca91fd372776dc89f628dc3bc3ce06e63dac725ba0217b67d7b2d8fcff56f5840e22c82162ea4bd805237df4a16c61295c6175121f452226
-  data.tar.gz: 7519af3448265a958f276452a7e9fd4d117ecf986bc61b2cc03f6552e37551b955f528e1656ee87b6ac8c36c20b26bc72b53316d5d540d760b6e5fa08f8aaf28
+  metadata.gz: 8245e24565df7b0ed6c5e17853dc3ffaaef4c9521f8b1421d8a4a777312321b4dc991e8bcf117de011f824a4b28201e8238676b1cf73a8ee1d84b8fab92d6b27
+  data.tar.gz: f202123fc99b2e209087839352152ac1695526ca8b77384a6c53579fe251c3b8429968fb69a6bf545bab5cdae2744de1c6b422a23564a79001c7ca7a7c68b7a7

data/README.md

@@ -2,10 +2,10 @@
 
     File        : README.md
     Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-    Date        : 2014-02-20
+    Date        : 2014-03-03
 
     Copyright   : Copyright (C) 2014  Felix C. Stegerman
-    Version     : v0.4.0
+    Version     : v0.4.1
 
 []: }}}1
 
@@ -35,14 +35,35 @@ $ eftcmdr examples/hello.yml
 
 ### SSH
 
+[]: {{{2
+
   You can use `eftcmdr-ssh-setup` to generate a
   `~/.ssh/authorized_keys` from `~/.eftcmdr.d/*.{pub,yml}` (see
   `examples/`).  This allows you to use `eftcmdr` to provide a menu
   over `ssh -t` that allows selected users to perform selected
   actions.
 
-  **NB**: be careful what you allow -- access to e.g. a rails console
-  makes it trivial to get complete shell access.
+  **NB**: be careful what you allow -- access to e.g. `rails console`
+  or `less` makes it trivial to get complete shell access.
+
+  You may need to load e.g. `~/.profile` (e.g. when `eftcmdr` is not
+  in the default `$PATH`).  To make this easier, you can pass a third
+  argument to `eftcmdr-ssh-setup` (or set `$EFTCMDR_SSH_COMMAND`) to
+  choose the command to be put in the `authorized_keys` file.  You can
+  use e.g. `$( which eftcmdr-ssh-wrapper )` to wrap `eftcmdr` in a
+  shell script that sources `~/.eftcmdr_env` (which can e.g. be a
+  symlink to `~/.profile`).
+
+[]: }}}2
+
+### Links
+
+&rarr; [blog
+post](http://obfusk.github.io/_/dev/2014-02-24/eft___eftcmdr__dialog_boxes_w__ruby__yaml_and_whiptail.html)
+(with pictures!)
+
+&rarr; [more complicated example yml
+file](https://gist.github.com/obfusk/9188866)
 
 []: }}}1
 

data/bin/eftcmdr-ssh-setup

@@ -2,7 +2,13 @@
 
 require 'eftcmdr'
 
+if (%w{ --help -h } & ARGV).any?
+  puts 'Usage: eftcmdr-ssh-setup [<authorized_keys_file> [<dir> [<cmd>]]]'
+  exit 0
+end
+
 file  = ARGV[0] || "#{Dir.home}/.ssh/authorized_keys"
 dir   = ARGV[1] || "#{Dir.home}/.eftcmdr.d"
+cmd   = ARGV[2] || ENV['EFTCMDR_SSH_COMMAND'] || 'eftcmdr'
 
-EftCmdr.build_authorized_keys file, dir
+EftCmdr.build_authorized_keys file, dir, cmd

data/bin/eftcmdr-ssh-wrapper

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec [__FILE__ + '.sh']*2, *ARGV

data/bin/eftcmdr-ssh-wrapper.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+[ ! -e ~/.eftcmdr_env ] || . ~/.eftcmdr_env
+eftcmdr "$@"

data/eftcmdr.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
 
   s.licenses    = %w{ LGPLv3+ }
 
-  s.executables = %w{ eftcmdr eftcmdr-ssh-setup }
+  s.executables = %w{ eftcmdr eftcmdr-ssh-setup eftcmdr-ssh-wrapper
+                      eftcmdr-ssh-wrapper.sh }
   s.files       = %w{ .yardopts README.md Rakefile eftcmdr.gemspec } \
-                + Dir['examples/**/*.{yml,apps}'] \
-                + Dir['lib/**/*.rb']
+                + Dir['examples/**/*.yml'] + Dir['lib/**/*.rb']
 
   s.add_runtime_dependency 'eft'
   s.add_runtime_dependency 'obfusk-util', '>= 0.5.0'

data/examples/bar.yml

@@ -23,21 +23,21 @@ _menu_commands: &_menu_commands
       then:
         eval:       eval_view_log
         code: |
-          sh! 'echo cd "$1" && echo tail -n "$2" logfile', app, ctx[:ask_lines]
+          osh! 'echo cd "$1" && echo tail -n "$2" logfile', app, ctx[:ask_lines]
 
   - tag:            console
     text:           rails console
     then:
       eval:         eval_rails_console
       code: |
-        sh! 'echo cd "$1" && echo rails console', app
+        osh! 'echo cd "$1" && echo rails console', app
 
   - tag:            psql
     text:           postgresql console
     then:
       eval:         eval_psql
       code: |
-        sh! 'echo psql "$1"', app
+        osh! 'echo psql "$1"', app
 
   - tag:            reset
     text:           git reset
@@ -52,11 +52,11 @@ _menu_commands: &_menu_commands
         then:
           eval:     eval_git_reset
           code: |
-            sh! 'echo cd "$1" && echo git reset --hard', app
+            osh! 'echo cd "$1" && echo git reset --hard', app
         else:
           eval:     eval_git_reset_cancelled
           code: |
-            puts 'git reset cancelled'
+            ohai 'git reset cancelled'
 
 menu:               menu_apps
 title:              apps

data/examples/baz.yml

@@ -0,0 +1,70 @@
+_apps: &_apps
+<% apps = file.sub(/\.yml\z/, '.apps') %>
+<% if File.exists? apps %>
+  <% File.read(apps).split.each do |x| %>
+- tag:  <%= x %>
+  text: The <%= x %> app
+  <% end %>
+<% end %>
+
+_menu_commands: &_menu_commands
+  menu:             menu_commands
+  title:            commands
+  text:             Choose a command to run
+  choices:
+
+  - tag:            log
+    text:           view log
+    then:
+      ask:          ask_lines
+      text:         How many lines?
+      default:      100
+      validate:     \A\d+\z
+      then:
+        eval:       eval_view_log
+        code: |
+          osh! 'echo cd "$1" && echo tail -n "$2" logfile', app, ctx[:ask_lines]
+
+  - tag:            console
+    text:           rails console
+    then:
+      eval:         eval_rails_console
+      code: |
+        osh! 'echo cd "$1" && echo rails console', app
+
+  - tag:            psql
+    text:           postgresql console
+    then:
+      eval:         eval_psql
+      code: |
+        osh! 'echo psql "$1"', app
+
+  - tag:            reset
+    text:           git reset
+    then:
+      show_text:    show_text_git_status
+      code: |
+        shc!('echo cd "$1" && echo git fetch --all && echo git status',
+          app, merge: true).stdout
+      then:
+        ask_yesno:  ask_yesno_git_reset
+        text:       Are you sure?
+        then:
+          eval:     eval_git_reset
+          code: |
+            osh! 'echo cd "$1" && echo git reset --hard', app
+        else:
+          eval:     eval_git_reset_cancelled
+          code: |
+            ohai 'git reset cancelled'
+
+menu:               menu_apps
+title:              apps
+text:               Choose an app
+choices: *_apps
+then:
+  eval:             eval_menu_apps
+  code: |
+    app = ctx[:menu_apps][:tag]
+  then: *_menu_commands
+

data/examples/foo.yml

@@ -23,21 +23,21 @@ _menu_commands: &_menu_commands
       then:
         eval:       eval_view_log
         code: |
-          sh! 'echo cd "$1" && echo tail -n "$2" logfile', app, ctx[:ask_lines]
+          osh! 'echo cd "$1" && echo tail -n "$2" logfile', app, ctx[:ask_lines]
 
   - tag:            console
     text:           rails console
     then:
       eval:         eval_rails_console
       code: |
-        sh! 'echo cd "$1" && echo rails console', app
+        osh! 'echo cd "$1" && echo rails console', app
 
   - tag:            psql
     text:           postgresql console
     then:
       eval:         eval_psql
       code: |
-        sh! 'echo psql "$1"', app
+        osh! 'echo psql "$1"', app
 
   - tag:            reset
     text:           git reset
@@ -52,11 +52,11 @@ _menu_commands: &_menu_commands
         then:
           eval:     eval_git_reset
           code: |
-            sh! 'echo cd "$1" && echo git reset --hard', app
+            osh! 'echo cd "$1" && echo git reset --hard', app
         else:
           eval:     eval_git_reset_cancelled
           code: |
-            puts 'git reset cancelled'
+            ohai 'git reset cancelled'
 
 menu:               menu_apps
 title:              apps

data/examples/qux.yml

@@ -14,7 +14,7 @@ _menu_stuff: &_menu_stuff
       then:
         eval:       eval_secret
         code: |
-          sh! 'echo the secret is "$1!"', ctx[:ask_pass_secret].to_s
+          osh! 'echo the secret is "$1!"', ctx[:ask_pass_secret].to_s
 
   - tag:            special
     text:           special stuff
@@ -48,7 +48,22 @@ _menu_stuff: &_menu_stuff
       esc:
         eval:       eval_esc
         code: |
-          puts 'ESCAPED!'
+          ohai 'ESCAPED!'
+
+  - tag:            radio
+    text:           Radiolist
+    then:
+      radio:        radio_bar
+      text:         Choose!
+      choices:
+      - tag:        first
+        text:       '#1'
+      - tag:        second
+        text:       '#2'
+      then:
+        show_msg:   show_msg_radio_bar
+        code: |
+          ctx[:radio_bar]
 
 menu:               menu_choose
 title:              choose
@@ -63,4 +78,4 @@ then: *_menu_stuff
 cancel:
   eval:             eval_cancelled
   code: |
-    puts 'CANCELLED!'
+    ohai 'CANCELLED!'

data/lib/eftcmdr.rb

@@ -2,7 +2,7 @@
 #
 # File        : eftcmdr.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2014-02-20
+# Date        : 2014-02-25
 #
 # Copyright   : Copyright (C) 2014  Felix C. Stegerman
 # Licence     : LGPLv3+
@@ -13,6 +13,7 @@ require 'erb'
 require 'yaml'
 
 require 'eft'
+require 'obfusk/util/message'
 require 'obfusk/util/sh'
 
 module EftCmdr
@@ -38,7 +39,8 @@ module EftCmdr
 
   # data: file, args, context
   class Data < Struct.new(:file, :args, :ctx)
-    %w{ sh sh? sh! shc shc? shc! }.each do |m|
+    %w{ ohai onow onoe opoo sh sh? sh! shc shc? shc! osh osh? osh!
+        oshc osch? oshc! }.each do |m|
       define_method(m) { |*a,&b| Obfusk::Util.send(m, *a, &b) }
     end
     def _binding; binding; end
@@ -138,7 +140,7 @@ module EftCmdr
     Eft.radio spec['text'],
         _opts(spec, selected: spec['selected']) do |r|
       spec['choices'].each do |c|
-        c.choice c['tag'], c['text']
+        r.choice c['tag'], c['text']
       end
       r.on_ok do |choice|
         then_run spec['then'], state, spec['radio'].to_sym => choice
@@ -234,19 +236,24 @@ module EftCmdr
 
   # --
 
-  # turn ~/.eftcmdr.d into ~/.ssh/authorized_keys
-  def self.build_authorized_keys(file, dir)                     # {{{1
+  # turn dir (e.g. `~/.eftcmdr.d`) into file (e.g.
+  # `~/.ssh/authorized_keys`): each `dir/$USER.pub` is added to `file`
+  # w/ forced command `cmd dir/$USER.yml $USER`; added entries are
+  # marked w/ a comment that includes the text `EFTCMDR` so that they
+  # can be ignored on subsequent runs.
+  def self.build_authorized_keys(file, dir, cmd)                # {{{1
     dir =~ %r{\A[A-Za-z0-9_./-]+\z} \
       or raise InvalidFileNameError, "invalid dir name: #{dir}"
+    cmd =~ %r{\A[A-Za-z0-9_./-]+\z} \
+      or raise InvalidFileNameError, "invalid command name: #{cmd}"
     original = (File.exists?(file) ? File.read(file) : '') \
                  .lines.reject { |l| l =~ /EFTCMDR/ }
     lines = Dir["#{dir}/*.pub"].sort.map do |x|
       b = File.basename x, '.pub'
       b =~ %r{\A[A-Za-z0-9_.-]+\z} \
         or raise InvalidFileNameError, "invalid file name: #{x}"
-      k = File.read(x).chomp
-      f = File.exists?("#{dir}/#{b}.yml") ? "#{b}.yml" : 'default.yml'
-      SSH_LINE["eftcmdr #{dir}/#{f} #{b}", k, "(EFTCMDR #{x})"]
+      k = File.read(x).chomp; f = x.sub /\.pub\z/, '.yml'
+      SSH_LINE["#{cmd} #{f} #{b}", k, "(EFTCMDR #{x})"]
     end
     File.open(file, 'w') do |f|
       (original + lines).each { |l| f.puts l }

data/lib/eftcmdr/version.rb

@@ -1,4 +1,4 @@
 module EftCmdr
-  VERSION = '0.4.0'
-  DATE    = '2014-02-20'
+  VERSION = '0.4.1'
+  DATE    = '2014-03-03'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eftcmdr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eft
@@ -60,6 +60,8 @@ email:
 executables:
 - eftcmdr
 - eftcmdr-ssh-setup
+- eftcmdr-ssh-wrapper
+- eftcmdr-ssh-wrapper.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,13 +72,14 @@ files:
 - examples/hello.yml
 - examples/qux.yml
 - examples/bar.yml
+- examples/baz.yml
 - examples/foo.yml
-- examples/foo.apps
-- examples/bar.apps
 - lib/eftcmdr.rb
 - lib/eftcmdr/version.rb
 - bin/eftcmdr
 - bin/eftcmdr-ssh-setup
+- bin/eftcmdr-ssh-wrapper
+- bin/eftcmdr-ssh-wrapper.sh
 homepage: https://github.com/obfusk/eftcmdr
 licenses:
 - LGPLv3+

data/examples/bar.apps

@@ -1 +0,0 @@
-qux quux

data/examples/foo.apps

@@ -1,2 +0,0 @@
-foo bar
-baz