alf-shell 0.13.1 → 0.14.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.14.0 / 2013-10-01
+
+* Added a .alfrc abstraction
+* Added documentation for `page` (follows alf-core changes)
+* Added documentation for `frame` (follows alf-core changes)
+
 # 0.13.1 / 2013-07-29
 
 * Embed the documentation so as to --help to work.

data/Gemfile

@@ -1,9 +1,7 @@
 source 'http://rubygems.org'
 
 group :runtime do
-  #gem "alf-core", :git => "git://github.com/alf-tool/alf-core.git"
-  #gem "alf-core", :path => "../alf-core"
-  gem "alf-core", "~> 0.13.0"
+  gem "alf-core", "~> 0.14.0"
   gem "quickl", "~> 0.4.3"
 end
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    alf-core (0.13.0)
+    alf-core (0.14.0)
       domain (~> 1.0)
       myrrha (~> 3.0)
       path (~> 1.3)
@@ -11,7 +11,7 @@ GEM
     highline (1.6.19)
     myrrha (3.0.0)
       domain (~> 1.0)
-    path (1.3.1)
+    path (1.3.3)
     quickl (0.4.3)
     rake (10.1.0)
     rspec (2.14.1)
@@ -28,7 +28,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  alf-core (~> 0.13.0)
+  alf-core (~> 0.14.0)
   highline (~> 1.6)
   quickl (~> 0.4.3)
   rake (~> 10.1)

data/doc/commands/show.md

@@ -1,19 +1,12 @@
 
-Output input tuples through a specific renderer (text, yaml, ...)
+Output input tuples through the default renderer in a specific order.
 
 SYNOPSIS
 
     alf #(command_name) NAME -- [ORDERING]
 
-OPTIONS
-
-    #(summarized_options)
-
 DESCRIPTION
 
 When a name is specified as commandline arg, request the database to
 provide the corresponding relation variable and prints its value.
 Otherwise, take what comes on standard input.
-
-Note that this command is not an operator and should not be piped
-anymore.

data/doc/operators/relational/frame.md

@@ -0,0 +1,26 @@
+
+Relational framing (aka offset/limit, yet sounder)
+
+SYNOPSIS
+
+    #(signature)
+
+DESCRIPTION
+
+This command provides the classical offset/limit over the input relation.
+
+This operator skips tuples whose ranking according to `ordering` is between
+`0` and `offset` exclusive (in other words, it skips `offset` tuples). In
+addition, it returns maximum `limit` tuples.
+
+To be sound, this operator requires the ordering to include a candidate key
+for the input relation. Alf will automatically extend the ordering you provide
+to guarantee this, provided key inference is possible.
+
+EXAMPLE
+
+    # Take the first two suppliers ordered by name (then by id)
+    !(alf frame suppliers -- name -- 0 -- 2)
+
+    # Take the next two suppliers
+    !(alf frame suppliers -- name -- 2 -- 2)

data/doc/operators/relational/hierarchize.md

@@ -0,0 +1,14 @@
+
+Relational hierarchy (recursive relation-trees)
+
+SYNOPSIS
+
+    #(signature)
+
+OPTIONS
+
+    #(summarized_options)
+
+DESCRIPTION
+
+This operator converts a "flat" relation to a recursively defined one.

data/doc/operators/relational/page.md

@@ -0,0 +1,31 @@
+
+Relational pagination (like frame, but easier)
+
+SYNOPSIS
+
+    #(signature)
+
+DESCRIPTION
+
+This command provides pagination over the input relation.
+
+When page_index is positive (resp. striclty negative), this operator returns
+`page_size` tuples whose ranking according to `ordering` (resp. reverse
+ordering) is between `page_size * (page_index - 1)` and `page_size * page_index`
+(excluded).
+
+To be sound, this operator requires the ordering to include a candidate key
+for the input relation. Alf will automatically extend the ordering you provide
+to guarantee this, provided key inference is possible.
+
+EXAMPLE
+
+    # Take the first two suppliers ordered by name (then by id)
+    !(alf page --page-size=2 suppliers -- name -- 1)
+
+    # Take the next two suppliers
+    !(alf page --page-size=2 suppliers -- name -- 2)
+
+    # Take the last two suppliers
+    !(alf page --page-size=2 suppliers -- name -- -1)
+

data/lib/alf/shell.rb

@@ -1,6 +1,7 @@
 require_relative 'shell/version'
 require_relative 'shell/loader'
 require_relative 'shell/ext/signature'
+require_relative 'shell/alfrc'
 require_relative 'shell/doc_manager'
 module Alf
   module Shell
@@ -8,6 +9,9 @@ module Alf
     # This is the main documentation extractor
     DOC_EXTRACTOR = DocManager.new
 
+    # This is the default configuration to be forked from
+    DEFAULT_CONFIG = Alfrc.new
+
     # Delegator command factory
     def self.Delegator()
       Quickl::Delegator(){|builder|

data/lib/alf/shell/alfrc.rb

@@ -0,0 +1,40 @@
+module Alf
+  module Shell
+    class Alfrc < Support::Config
+
+      # Path to be put in $LOAD_PATH before executing alf
+      option :load_paths, Array, []
+
+      # Libraries to require before executing alf
+      option :requires, Array, []
+
+      # Default renderer to use for outputting relations
+      option :default_renderer, Class, ->{ $stdout.tty? ? Renderer::Text : Renderer::Rash }
+
+      # Float format to use
+      option :float_format, String, "%.3f"
+
+      # Pretty print in console mode?
+      option :pretty, Boolean, ->{ $stdout.tty? }
+
+      # The adapter to use by default
+      option :adapter, Object, ->{ Path.pwd } 
+
+      # The database to use by default
+      option :database, Database, ->{ Database.new(adapter) }
+
+      # The viewpoint to use by default
+      option :viewpoint, Module, ->{ Viewpoint::NATIVE }
+
+      # If `path` is provided, evaluates the content of the file on this
+      # instance. Also, if a block is passed, yields it with self. Return
+      # self in any case.
+      def alfrc(path = nil)
+        ::Kernel.eval(Path(path).read, binding, path.to_s) if path
+        yield(self) if block_given?
+        self
+      end
+
+    end # class Alfrc
+  end # module Shell
+end # module Alf

data/lib/alf/shell/command/exec.rb

@@ -8,7 +8,7 @@ module Alf
         else
           $stdin.read
         end
-        database.query(cmd)
+        connection.query(cmd)
       end
 
     end # class Exec

data/lib/alf/shell/command/main.rb

@@ -42,45 +42,37 @@ module Alf
 
       end # class << self
 
-      # Connection instance to use to get base relations
-      attr_accessor :database
-
       # The reader to use when stdin is used as operand
       attr_accessor :stdin_operand
 
-      # Output renderer
-      attr_accessor :renderer_class
-
-      # Rendering options
-      attr_reader :rendering_options
-
       # Creates a command instance
-      def initialize(db = Alf.connect(Path.pwd))
-        @database = db
-        @rendering_options = {}
+      def initialize(config = load_config)
+        @config = config
       end
+      attr_reader :config
 
       # Install options
       options do |opt|
+        @rendering_options = {}
+
         @execute = false
         opt.on("-e", "--execute", "Execute one line of script (Lispy API)") do
           @execute = true
         end
 
-        @renderer_class = nil
         Renderer.each do |name,descr,clazz|
           opt.on("--#{name}", "Render output #{descr}"){
-            @renderer_class = clazz
+            config.default_renderer = clazz
           }
         end
 
         opt.on('--examples', "Use the example database for database") do
-          @database = Alf.examples
+          config.adapter = Alf.examples_adapter
         end
 
         opt.on('--db=DB',
                "Set the database to use") do |value|
-          @database = Alf.connect(value)
+          config.adapter = value
         end
 
         @input_reader = :rash
@@ -93,20 +85,27 @@ module Alf
 
         opt.on("-Idirectory",
                "Specify $LOAD_PATH directory (may be used more than once)") do |val|
-          $LOAD_PATH.unshift val
+          config.load_paths << val
         end
 
         opt.on('-rlibrary',
-               "Require the library, before executing alf") do |value|
-          require(value)
+               "Require the library, before executing alf") do |val|
+          config.requires << val
+        end
+
+        opt.on("--ff=FORMAT",
+               "Specify the floating point format") do |val|
+          config.float_format = val
         end
 
         opt.on("--[no-]pretty",
                "Enable/disable pretty print best effort") do |val|
-          self.pretty = val
+          config.pretty = val
         end
 
         opt.on_tail('-h', "--help", "Show help") do
+          install_load_path
+          install_requires
           raise Quickl::Help
         end
 
@@ -120,42 +119,68 @@ module Alf
         @stdin_operand || Reader.send(@input_reader, $stdin)
       end
 
+      def connection
+        @connection ||= config.database.connection(viewpoint: config.viewpoint)
+      end
+
       def execute(argv)
+        install_load_path
+        install_requires
+
         # special case where a .alf file is provided
-        if argv.empty? or (argv.size == 1 && Path(argv.first).exist?)
+        if argv.empty? or (argv.size == 1 && Path(argv.first).file?)
           argv.unshift("exec")
         end
 
         # compile the operator, render and returns it
         compile(argv){ super }.tap do |op|
-          render(op.to_cog) if op && requester
+          render(connection.compile(op)) if op && requester
+        end
+      end
+
+    private
+
+      def install_load_path
+        config.load_paths.each do |path|
+          $: << path
         end
       end
 
-      def pretty=(val)
-        @rendering_options[:pretty] = val
-        if val && (hl = highline)
-          @rendering_options[:trim_at] = hl.output_cols
-          @rendering_options[:page_at] = hl.output_rows
+      def install_requires
+        config.requires.each do |who|
+          require(who)
         end
-        val
       end
 
-    private
+      def load_config
+        config = Alf::Shell::DEFAULT_CONFIG.dup
+        if alfrc_file = Path.pwd.backfind('.alfrc')
+          config.alfrc(alfrc_file)
+        end
+        config
+      end
 
       def compile(argv)
         if @execute
-          database.query(argv.first)
+          connection.query(argv.first)
         else
           op = yield
-          op = op.bind(database) if op
+          op = op.bind(connection) if op
           op
         end
       end
 
+      def rendering_options
+        options = { float_format: config.float_format }
+        if config.pretty? and (hl = highline)
+          options[:pretty]  = config.pretty?
+          options[:trim_at] = hl.output_cols - 1
+        end
+        options
+      end
+
       def render(operator, out = $stdout)
-        renderer_class = self.renderer_class || default_renderer_class
-        renderer = renderer_class.new(operator, rendering_options)
+        renderer = config.default_renderer.new(operator, rendering_options)
         renderer.execute(out)
       end
 
@@ -163,11 +188,6 @@ module Alf
         require 'highline'
         HighLine.new($stdin, $stdout)
       rescue LoadError => ex
-        nil
-      end
-
-      def default_renderer_class
-        $stdout.tty? ? Renderer::Text : Renderer::Rash
       end
 
     end # class Main

data/lib/alf/shell/command/show.rb

@@ -2,37 +2,11 @@ module Alf
   module Shell
     class Show < Shell::Command()
 
-      options do |opt|
-        @renderer_class = nil
-        Renderer.each do |name,descr,clazz|
-          opt.on("--#{name}", "Render output #{descr}"){
-            @renderer_class = clazz
-          }
-        end
-
-        @pretty = nil
-        opt.on("--[no-]pretty",
-               "Enable/disable pretty print best effort") do |val|
-          @pretty = val
-        end
-
-        @ff = nil
-        opt.on("--ff=FORMAT",
-               "Specify the floating point format") do |val|
-          @ff = val
-        end
-      end
-
       def run(argv, requester)
         # set requester and parse options
         @requester = requester
         argv = parse_options(argv, :split)
 
-        # Set options on the requester
-        requester.pretty = @pretty unless @pretty.nil?
-        requester.rendering_options[:float_format] = @ff unless @ff.nil?
-        requester.renderer_class = (@renderer_class || requester.renderer_class)
-
         compile(argv)
       end
 

data/lib/alf/shell/doc_manager.rb

@@ -9,8 +9,8 @@ module Alf
       # Called by Quickl when it's time to generate documentation of `cmd`.
       #
       def call(cmd, options = {})
-        if File.exists?(file = find_file(cmd))
-          text = File.read(file)
+        if (file = find_file(cmd)).file?
+          text = file.read
 
           # Replace occurences of #{signature} to #{signature.to_xxx}
           # according to options
@@ -54,7 +54,8 @@ module Alf
         argv = Quickl.split_commandline_args(argv, '|')
         argv.inject(nil) do |cmd,arr|
           arr.shift if arr.first == "alf"
-          main = Alf::Shell::Main.new(Alf.examples)
+          main = Alf::Shell::Main.new(Alf::Shell::DEFAULT_CONFIG)
+          main.config.adapter = Alf.examples_adapter
           main.stdin_operand = cmd unless cmd.nil?
           main.run(arr, requester)
         end
@@ -75,7 +76,7 @@ module Alf
         else
           raise "Unexpected command #{cmd}"
         end
-        File.join(DOC_FOLDER, where, "#{cmd.command_name}.md")
+        DOC_FOLDER/where/"#{cmd.command_name}.md"
       end
 
     end # class DocManager

data/lib/alf/shell/from_argv.rb

@@ -15,6 +15,12 @@ module Alf
         Size.new(Integer(argv.first || 0))
       }
 
+      # ARGV -> Integer
+      c.coercion(Array, Integer){|argv,_|
+        throw :next_rule if argv.size > 1
+        Integer(argv.first || 0)
+      }
+
       # ARGV -> AttrName
       c.coercion(Array, AttrName){|argv,_|
         throw :next_rule if argv.size > 1

data/lib/alf/shell/support.rb

@@ -2,21 +2,22 @@ module Alf
   module Shell
     module Support
 
-      def database
-        requester && requester.database
+      def connection
+        requester && requester.connection
       end
 
       def compiler
-        @compiler ||= (database && database.connection.compiler) || Engine::Compiler.new(nil)
+        @compiler ||= (connection && connection.compiler) || Engine::Compiler.new(nil)
       end
 
       def operands(argv, size = nil)
         operands = [ stdin_operand ] + Array(argv)
         operands = operands[(operands.size - size)..-1] if size
         operands = operands.map{|arg|
-          arg = Algebra.named_operand(arg.to_sym, database) if arg.is_a?(String)
+          arg = connection.relvar(arg) if arg.is_a?(String)
           Algebra::Operand.coerce(arg)
         }
+        operands
       end
 
       def stdin_operand

data/lib/alf/shell/version.rb

@@ -3,8 +3,8 @@ module Alf
     module Version
 
       MAJOR = 0
-      MINOR = 13
-      TINY  = 1
+      MINOR = 14
+      TINY  = 0
 
       def self.to_s
         [ MAJOR, MINOR, TINY ].join('.')

data/spec/fixtures/example.alfrc

@@ -0,0 +1,13 @@
+alfrc do |c|
+
+  # Include the lib folder that is a brother of .alfrc
+  c.load_paths |= [
+    Path.dir/'lib'
+  ] 
+
+  # Require the 'alf-sequel'
+  c.requires |= [
+    'alf-sequel'
+  ]
+
+end

data/spec/integration/alf/alf_db.cmd

@@ -1 +1 @@
-alf --db=$(_("alf",__FILE__)) show --text rel
+alf --text --db=$(_("alf",__FILE__)) show rel

data/spec/integration/alf/alf_help.stdout

@@ -19,9 +19,10 @@ OPTIONS
     --csv                        Render output in CSV
     --examples                   Use the example database for database
     --db=DB                      Set the database to use
-    --input-reader=READER        Specify the kind of reader when reading on $stdin (rash,csv,json)
+    --input-reader=READER        Specify the kind of reader when reading on $stdin (rash,csv,json,ruby)
     -Idirectory                      Specify $LOAD_PATH directory (may be used more than once)
     -rlibrary                        Require the library, before executing alf
+    --ff=FORMAT                  Specify the floating point format
     --[no-]pretty                Enable/disable pretty print best effort
     -h, --help                       Show help
     -v, --version                    Show version
@@ -29,12 +30,14 @@ OPTIONS
 RELATIONAL OPERATORS
 
     extend           Relational extension (additional, computed attributes)
+    frame            Relational framing (aka offset/limit, yet sounder)
     group            Relational grouping (relation-valued attributes)
     intersect        Relational intersection (aka a logical and)
     join             Relational join (and cartesian product)
     matching         Relational matching (join + project back on left)
     minus            Relational minus (aka difference)
     not-matching     Relational not matching (inverse of matching)
+    page             Relational pagination (like frame, but easier)
     project          Relational projection (clip + compact)
     rank             Relational ranking (explicit tuple positions)
     rename           Relational renaming (rename some attributes)
@@ -47,6 +50,7 @@ RELATIONAL OPERATORS
 
 EXPERIMENTAL RELATIONAL OPERATORS
 
+    hierarchize       Relational hierarchy (recursive relation-trees)
     infer-heading     Relational heading inference (print the relation type)
     quota             Generalized quota-queries (position, sum progression, etc.)
 
@@ -65,7 +69,7 @@ OTHER NON-RELATIONAL COMMANDS
 
     exec     Executes an .alf file on current database
     help     Show help about a specific command
-    show     Output input tuples through a specific renderer (text, yaml, ...)
+    show     Output input tuples through the default renderer in a specific order.
 
 See 'alf help COMMAND' for details about a specific command.
 

data/spec/integration/frame/frame_0.cmd

@@ -0,0 +1 @@
+alf --text frame suppliers -- name -- 1 -- 2

data/spec/integration/frame/frame_0.stdout

@@ -0,0 +1,6 @@
++------+-------+---------+--------+
+| :sid | :name | :status | :city  |
++------+-------+---------+--------+
+| S3   | Blake |      30 | Paris  |
+| S4   | Clark |      20 | London |
++------+-------+---------+--------+

data/spec/integration/help/help_1.stdout

@@ -1,25 +1,12 @@
 
-Output input tuples through a specific renderer (text, yaml, ...)
+Output input tuples through the default renderer in a specific order.
 
 SYNOPSIS
 
     alf show NAME -- [ORDERING]
 
-OPTIONS
-
-    --rash                       Render output as ruby hashes
-    --text                       Render output as a text table
-    --yaml                       Render output in YAML
-    --json                       Render output in JSON
-    --csv                        Render output in CSV
-    --[no-]pretty                Enable/disable pretty print best effort
-    --ff=FORMAT                  Specify the floating point format
-
 DESCRIPTION
 
 When a name is specified as commandline arg, request the database to
 provide the corresponding relation variable and prints its value.
 Otherwise, take what comes on standard input.
-
-Note that this command is not an operator and should not be piped
-anymore.

data/spec/integration/page/page_0.cmd

@@ -0,0 +1 @@
+alf --text page --page-size=2 suppliers -- name -- 1

data/spec/integration/page/page_0.stdout

@@ -0,0 +1,6 @@
++------+-------+---------+--------+
+| :sid | :name | :status | :city  |
++------+-------+---------+--------+
+| S5   | Adams |      30 | Athens |
+| S3   | Blake |      30 | Paris  |
++------+-------+---------+--------+

data/spec/integration/show/show_base_sort_1.cmd

@@ -1 +1 @@
-alf show --text suppliers -- city asc sid asc
+alf --text show suppliers -- city asc sid asc

data/spec/integration/show/show_base_sort_2.cmd

@@ -1 +1 @@
-alf show --text suppliers -- city asc status desc sid asc
+alf --text show suppliers -- city asc status desc sid asc

data/spec/integration/show/show_ff.cmd

@@ -1 +1 @@
-alf show --text parts --ff=%.6f
+alf --text --ff=%.6f show parts

data/spec/integration/show/show_rash.cmd

@@ -1 +1 @@
-alf show suppliers --rash
+alf --rash show suppliers

data/spec/integration/show/show_rash_pretty.cmd

@@ -1 +1 @@
-alf show suppliers --rash --pretty
+alf --rash --pretty show suppliers

data/spec/integration/show/show_yaml.cmd

@@ -1 +1 @@
-alf show suppliers --yaml -- sid asc
+alf --yaml show suppliers -- sid asc

data/spec/integration/test_shell.rb

@@ -10,8 +10,13 @@ end
 
 describe "Alf's alf command / " do
 
-  Path.dir.glob('**/*.cmd').each do |input|
+  before do
+    Path.dir.chdir
+  end
+
+  Path.dir.glob('**/*.cmd').each_with_index do |input,index|
     cmd = wlang(input.readlines.first, binding)
+
     specify{ cmd.should =~ /^alf / }
   
     describe "#{input.basename}: #{cmd}" do
@@ -36,9 +41,7 @@ describe "Alf's alf command / " do
       
       specify{
         begin 
-          dir = Path.relative('__database__')
           main = Alf::Shell::Main.new
-          main.database = Alf.connect(dir)
           main.run(argv, __FILE__)
         rescue => ex
           begin

data/spec/unit/alfrc/test_alfrc.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+module Alf
+  module Shell
+    describe Alfrc, 'alfrc' do
+
+      let(:alfrc){ Alfrc.new{|c| c.load_paths = ["foo"] } }
+
+      context 'with a block' do
+        subject{ alfrc.alfrc{|c| @seen = c } }
+
+        it 'should return the instance itself' do
+          subject.should be(alfrc)
+        end
+
+        it 'should yield the block' do
+          subject
+          @seen.should be(alfrc)
+        end
+      end
+
+      context 'with a path' do
+        subject{ alfrc.alfrc(path) }
+
+        let(:path){ Path.backfind("spec/fixtures/example.alfrc") }
+
+        it 'should return the instance itself' do
+          subject.should be(alfrc)
+        end
+
+        it 'should resolve the load paths correctly' do
+          subject.load_paths.should eq([ "foo", path.parent/'lib' ])
+        end
+
+        it 'should set requires correctly' do
+          subject.requires.should eq([ 'alf-sequel' ])
+        end
+      end
+
+      context 'with a path and a block' do
+        subject{ alfrc.alfrc(path){|c| c.requires = ['bar'] } }
+
+        let(:path){ Path.backfind("spec/fixtures/example.alfrc") }
+
+        it 'should return the instance itself' do
+          subject.should be(alfrc)
+        end
+
+        it 'should resolve the load paths correctly' do
+          subject.load_paths.should eq([ "foo", path.parent/'lib' ])
+        end
+
+        it 'should yield the block after the path' do
+          subject.requires.should eq([ 'bar' ])
+        end
+      end
+
+    end
+  end
+end

data/spec/unit/doc_manager/test_call.rb

@@ -12,7 +12,7 @@ module Alf
       describe "on a static file" do
         before{
           def dm.find_file(cmd);
-            File.expand_path('../static.md', __FILE__)
+            Path.dir/'static.md'
           end
         }
         it { should eq("Hello\n") }
@@ -21,21 +21,19 @@ module Alf
       describe "on a dynamic file" do
         before{
           def dm.find_file(cmd);
-            File.expand_path('../dynamic.md', __FILE__)
+            Path.dir/'dynamic.md'
           end
         }
         it { should eq("show\n") }
       end
 
-      unless RUBY_VERSION < "1.9"
-        describe "on an example file" do
-          before{
-            def dm.find_file(cmd);
-              File.expand_path('../example.md', __FILE__)
-            end
-          }
-          it { should eq(File.read(File.expand_path('../example_1.txt', __FILE__))) }
-        end
+      describe "on an example file" do
+        before{
+          def dm.find_file(cmd);
+            Path.dir/'example.md'
+          end
+        }
+        it { should eq((Path.dir/"example_1.txt").read) }
       end
 
     end

data/spec/unit/main/test_I_option.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+module Alf
+  module Shell
+    describe Main, "-I" do
+
+      before do
+        Path.dir.chdir
+        subject
+      end
+
+      let(:cmd){ Main.new }
+
+      subject{
+        cmd.parse_options(argv)
+        cmd
+      }
+
+      context 'when no explicitly set' do
+        let(:argv){ [] }
+
+        it 'should have defaults only' do
+          cmd.config.load_paths.should eq(["a_load_path"])
+        end
+      end
+
+      context 'when specified multiple times' do
+        let(:argv){ ["-Ilib", "-Ispec"] }
+
+        it 'should have defaults only' do
+          cmd.config.load_paths.should eq(["a_load_path", "lib", "spec"])
+        end
+      end
+
+    end
+  end
+end

data/spec/unit/main/test_r_option.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+module Alf
+  module Shell
+    describe Main, "-r" do
+
+      before do
+        Path.dir.chdir
+        subject
+      end
+
+      let(:cmd){ Main.new }
+
+      subject{
+        cmd.parse_options(argv)
+        cmd
+      }
+
+      context 'when no explicitly set' do
+        let(:argv){ [] }
+
+        it 'should have defaults only' do
+          cmd.config.requires.should eq(["a_require"])
+        end
+      end
+
+      context 'when specified multiple times' do
+        let(:argv){ ["-ralf-sequel", "-rpry"] }
+
+        it 'should have defaults only' do
+          cmd.config.requires.should eq(["a_require", "alf-sequel", "pry"])
+        end
+      end
+
+    end
+  end
+end

data/spec/unit/main/test_renderer_option.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+module Alf
+  module Shell
+    describe Main, "--text, --json and the like" do
+
+      before do
+        Path.dir.chdir
+        subject
+      end
+
+      let(:cmd){ Main.new }
+
+      subject{
+        cmd.parse_options(argv)
+        cmd
+      }
+
+      context 'when set to --json' do
+        let(:argv){ ["--json"] }
+
+        it 'should set the default renderer' do
+          cmd.config.default_renderer.should be(Alf::Renderer::JSON)
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf-shell
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: quickl
   requirement: !ruby/object:Gem::Requirement
@@ -116,13 +116,16 @@ files:
 - doc/operators/non_relational/sort.md
 - doc/operators/non_relational/type-safe.md
 - doc/operators/relational/extend.md
+- doc/operators/relational/frame.md
 - doc/operators/relational/group.md
+- doc/operators/relational/hierarchize.md
 - doc/operators/relational/infer-heading.md
 - doc/operators/relational/intersect.md
 - doc/operators/relational/join.md
 - doc/operators/relational/matching.md
 - doc/operators/relational/minus.md
 - doc/operators/relational/not-matching.md
+- doc/operators/relational/page.md
 - doc/operators/relational/project.md
 - doc/operators/relational/quota.md
 - doc/operators/relational/rank.md
@@ -133,6 +136,7 @@ files:
 - doc/operators/relational/union.md
 - doc/operators/relational/unwrap.md
 - doc/operators/relational/wrap.md
+- lib/alf/shell/alfrc.rb
 - lib/alf/shell/command/exec.rb
 - lib/alf/shell/command/help.rb
 - lib/alf/shell/command/main.rb
@@ -151,6 +155,7 @@ files:
 - Manifest.txt
 - Rakefile
 - README.md
+- spec/fixtures/example.alfrc
 - spec/integration/__database__/group.alf
 - spec/integration/__database__/parts.rash
 - spec/integration/__database__/suppliers.rash
@@ -192,6 +197,8 @@ files:
 - spec/integration/defaults/defaults_2.stdout
 - spec/integration/extend/extend_0.cmd
 - spec/integration/extend/extend_0.stdout
+- spec/integration/frame/frame_0.cmd
+- spec/integration/frame/frame_0.stdout
 - spec/integration/generator/generator_1.cmd
 - spec/integration/generator/generator_1.stdout
 - spec/integration/generator/generator_2.cmd
@@ -214,6 +221,8 @@ files:
 - spec/integration/minus/minus_0.stdout
 - spec/integration/not-matching/not-matching_0.cmd
 - spec/integration/not-matching/not-matching_0.stdout
+- spec/integration/page/page_0.cmd
+- spec/integration/page/page_0.stdout
 - spec/integration/project/project_0.cmd
 - spec/integration/project/project_0.stdout
 - spec/integration/project/project_1.cmd
@@ -242,8 +251,6 @@ files:
 - spec/integration/show/show_base_sort_1.stdout
 - spec/integration/show/show_base_sort_2.cmd
 - spec/integration/show/show_base_sort_2.stdout
-- spec/integration/show/show_conflictual.cmd
-- spec/integration/show/show_conflictual.stdout
 - spec/integration/show/show_ff.cmd
 - spec/integration/show/show_ff.stdout
 - spec/integration/show/show_rash.cmd
@@ -271,6 +278,7 @@ files:
 - spec/integration/wrap/wrap_0.stdout
 - spec/spec_helper.rb
 - spec/test_shell.rb
+- spec/unit/alfrc/test_alfrc.rb
 - spec/unit/doc_manager/dynamic.md
 - spec/unit/doc_manager/example.md
 - spec/unit/doc_manager/example_1.txt
@@ -290,6 +298,9 @@ files:
 - spec/unit/from_argv/test_to_tuple_computation.rb
 - spec/unit/from_argv/test_to_tuple_expression.rb
 - spec/unit/main/test_class_methods.rb
+- spec/unit/main/test_I_option.rb
+- spec/unit/main/test_r_option.rb
+- spec/unit/main/test_renderer_option.rb
 - spec/unit/operator/test_autonum.rb
 - spec/unit/operator/test_clip.rb
 - spec/unit/operator/test_coerce.rb
@@ -331,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1359397490184999599
+      hash: 1654527447503089080
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/integration/show/show_conflictual.cmd

@@ -1 +0,0 @@
-alf --yaml show suppliers --rash

data/spec/integration/show/show_conflictual.stdout

@@ -1,5 +0,0 @@
-{:sid => "S1", :name => "Smith", :status => 20, :city => "London"}
-{:sid => "S2", :name => "Jones", :status => 10, :city => "Paris"}
-{:sid => "S3", :name => "Blake", :status => 30, :city => "Paris"}
-{:sid => "S4", :name => "Clark", :status => 20, :city => "London"}
-{:sid => "S5", :name => "Adams", :status => 30, :city => "Athens"}