alf-shell 0.14.0 → 0.15.0

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

@@ -0,0 +1,32 @@
+module Alf
+  module Shell
+    class Metadata < Shell::Command(__FILE__, __LINE__)
+
+      options do |opt|
+
+        opt.on_tail('-h', "--help", "Show help") do
+          show_help("alf-metadata")
+        end
+
+      end
+
+      def run(argv, requester)
+        # set requester and parse options
+        @requester = requester
+        argv = parse_options(argv, :split)
+
+        operand = compile(argv)
+        keys    = operand.keys.to_a.map{|k| k.to_a }
+        heading = Relation(operand.heading.to_hash.each_pair.map{|k,v|
+          {attribute: k, type: v.to_s}
+        })
+        puts Relation({heading: heading, keys: keys})
+      end
+
+      def compile(argv)
+        operand(argv.shift)
+      end
+
+    end # class Metadata
+  end # module Shell
+end # module Alf

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

@@ -1,6 +1,14 @@
 module Alf
   module Shell
-    class Show < Shell::Command()
+    class Show < Shell::Command(__FILE__, __LINE__)
+
+      options do |opt|
+
+        opt.on_tail('-h', "--help", "Show help") do
+          show_help("alf-show")
+        end
+
+      end
 
       def run(argv, requester)
         # set requester and parse options
@@ -11,13 +19,17 @@ module Alf
       end
 
       def compile(argv)
-        operand = operands(argv.shift, 1).last
-        unless argv.empty?
-          operand = Algebra::Sort.new([operand], Shell.from_argv(argv.first, Ordering))
-        end
+        operand = operand(argv.shift)
+        operand = sort(operand, argv.first) unless argv.empty?
         operand
       end
 
+    private
+
+      def sort(operand, ordering)
+        Algebra::Sort.new([operand], Ordering.coerce(ordering))
+      end
+
     end # class Show
   end # module Shell
 end # module Alf

data/lib/alf/shell/support.rb

@@ -2,26 +2,34 @@ module Alf
   module Shell
     module Support
 
+      AlfFile = ->(arg){
+        path = Path(arg)
+        path.file? and path.ext =~ /^\.?alf$/
+      }
+
       def connection
         requester && requester.connection
       end
 
-      def compiler
-        @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 = connection.relvar(arg) if arg.is_a?(String)
+      def operand(arg)
+        case arg
+        when AlfFile then operand(Path(arg).read)
+        when String  then connection.relvar(arg)
+        when Array   then operand(arg.first)
+        else
           Algebra::Operand.coerce(arg)
-        }
-        operands
+        end
       end
 
-      def stdin_operand
-        requester.stdin_operand rescue $stdin
+      def show_help(who)
+        who = "alf-#{who}" if /explain|metadata|show/ =~ who
+        if p = Path.backfind("doc/man/#{who}.man")
+          exit if system("man #{p}")
+          puts Path.backfind("doc/txt/#{who}.txt").read
+        else
+          puts "Unknown command/operator `#{who}`"
+        end
+        exit
       end
 
     end # module Support

data/lib/alf/shell/version.rb

@@ -3,7 +3,7 @@ module Alf
     module Version
 
       MAJOR = 0
-      MINOR = 14
+      MINOR = 15
       TINY  = 0
 
       def self.to_s

data/spec/integration/explain/explain.cmd

@@ -0,0 +1 @@
+alf explain "restrict(suppliers, sid: 'S1')"

data/spec/integration/explain/explain.stdout

@@ -0,0 +1,11 @@
+Logical plan:
+
+  Alf::Relvar::Virtual ...
+  +-- restrict(..., ->(t){ t.sid == "S1" })
+     +-- suppliers
+
+Physical plan:
+
+  Filter ..., ->(t){ t.sid == "S1" }
+  +-- Leaf
+     +-- Alf::Reader::Rash(suppliers.rash)

data/spec/integration/show/group.alf

@@ -0,0 +1,2 @@
+#!/usr/bin/env alf
+group(supplies, [:sid], :supplying, :allbut => true)

data/spec/integration/show/show_alf.cmd

@@ -0,0 +1 @@
+alf --text show show/group.alf

data/tasks/doc.rake

@@ -0,0 +1,4 @@
+desc "Import documentation from alf-doc"
+task :doc do
+  `rm -rf doc && mkdir -p doc && cp -R ../alf-doc/compiled/man doc && cp -R ../alf-doc/compiled/txt doc`
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alf-shell
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: alf-doc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: quickl
   requirement: !ruby/object:Gem::Requirement
@@ -103,50 +119,98 @@ files:
 - Gemfile
 - Gemfile.lock
 - bin/alf
-- doc/commands/exec.md
-- doc/commands/help.md
-- doc/commands/main.md
-- doc/commands/show.md
-- doc/operators/non_relational/autonum.md
-- doc/operators/non_relational/clip.md
-- doc/operators/non_relational/coerce.md
-- doc/operators/non_relational/compact.md
-- doc/operators/non_relational/defaults.md
-- doc/operators/non_relational/generator.md
-- 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
-- doc/operators/relational/rename.md
-- doc/operators/relational/restrict.md
-- doc/operators/relational/summarize.md
-- doc/operators/relational/ungroup.md
-- doc/operators/relational/union.md
-- doc/operators/relational/unwrap.md
-- doc/operators/relational/wrap.md
+- doc/man/alf-explain.man
+- doc/man/alf-metadata.man
+- doc/man/alf-show.man
+- doc/man/alf.man
+- doc/man/allbut.man
+- doc/man/among.man
+- doc/man/avg.man
+- doc/man/between.man
+- doc/man/concat.man
+- doc/man/contradiction.man
+- doc/man/count.man
+- doc/man/eq.man
+- doc/man/extend.man
+- doc/man/frame.man
+- doc/man/group.man
+- doc/man/gt.man
+- doc/man/gte.man
+- doc/man/intersect.man
+- doc/man/join.man
+- doc/man/lt.man
+- doc/man/lte.man
+- doc/man/matching.man
+- doc/man/max.man
+- doc/man/min.man
+- doc/man/minus.man
+- doc/man/native.man
+- doc/man/neq.man
+- doc/man/not_matching.man
+- doc/man/page.man
+- doc/man/project.man
+- doc/man/rank.man
+- doc/man/rename.man
+- doc/man/restrict.man
+- doc/man/stddev.man
+- doc/man/sum.man
+- doc/man/summarize.man
+- doc/man/tautology.man
+- doc/man/ungroup.man
+- doc/man/union.man
+- doc/man/unwrap.man
+- doc/man/variance.man
+- doc/man/wrap.man
+- doc/txt/alf-explain.man
+- doc/txt/alf-metadata.man
+- doc/txt/alf-show.man
+- doc/txt/alf.man
+- doc/txt/allbut.txt
+- doc/txt/among.txt
+- doc/txt/avg.txt
+- doc/txt/between.txt
+- doc/txt/concat.txt
+- doc/txt/contradiction.txt
+- doc/txt/count.txt
+- doc/txt/eq.txt
+- doc/txt/extend.txt
+- doc/txt/frame.txt
+- doc/txt/group.txt
+- doc/txt/gt.txt
+- doc/txt/gte.txt
+- doc/txt/intersect.txt
+- doc/txt/join.txt
+- doc/txt/lt.txt
+- doc/txt/lte.txt
+- doc/txt/matching.txt
+- doc/txt/max.txt
+- doc/txt/min.txt
+- doc/txt/minus.txt
+- doc/txt/native.txt
+- doc/txt/neq.txt
+- doc/txt/not_matching.txt
+- doc/txt/page.txt
+- doc/txt/project.txt
+- doc/txt/rank.txt
+- doc/txt/rename.txt
+- doc/txt/restrict.txt
+- doc/txt/stddev.txt
+- doc/txt/sum.txt
+- doc/txt/summarize.txt
+- doc/txt/tautology.txt
+- doc/txt/ungroup.txt
+- doc/txt/union.txt
+- doc/txt/unwrap.txt
+- doc/txt/variance.txt
+- doc/txt/wrap.txt
 - lib/alf/shell/alfrc.rb
-- lib/alf/shell/command/exec.rb
+- lib/alf/shell/command/explain.rb
 - lib/alf/shell/command/help.rb
 - lib/alf/shell/command/main.rb
+- lib/alf/shell/command/metadata.rb
 - lib/alf/shell/command/show.rb
 - lib/alf/shell/command.rb
-- lib/alf/shell/doc_manager.rb
-- lib/alf/shell/ext/signature.rb
-- lib/alf/shell/from_argv.rb
 - lib/alf/shell/loader.rb
-- lib/alf/shell/operator.rb
 - lib/alf/shell/support.rb
 - lib/alf/shell/version.rb
 - lib/alf/shell.rb
@@ -156,7 +220,6 @@ files:
 - Rakefile
 - README.md
 - spec/fixtures/example.alfrc
-- spec/integration/__database__/group.alf
 - spec/integration/__database__/parts.rash
 - spec/integration/__database__/suppliers.rash
 - spec/integration/__database__/suppliers_csv.csv
@@ -164,87 +227,18 @@ files:
 - spec/integration/alf/alf.db
 - spec/integration/alf/alf_db.cmd
 - spec/integration/alf/alf_db.stdout
-- spec/integration/alf/alf_e.cmd
-- spec/integration/alf/alf_e.stdout
-- spec/integration/alf/alf_help.cmd
-- spec/integration/alf/alf_help.stdout
 - spec/integration/alf/alf_json.cmd
 - spec/integration/alf/alf_json.stdout
-- spec/integration/alf/alf_r.cmd
-- spec/integration/alf/alf_r.stdout
 - spec/integration/alf/alf_version.cmd
 - spec/integration/alf/alf_version.stdout
 - spec/integration/alf/alf_yaml.cmd
 - spec/integration/alf/alf_yaml.stdout
 - spec/integration/alf/rel.rash
-- spec/integration/autonum/autonum_0.cmd
-- spec/integration/autonum/autonum_0.stdout
-- spec/integration/autonum/autonum_1.cmd
-- spec/integration/autonum/autonum_1.stdout
-- spec/integration/clip/clip_0.cmd
-- spec/integration/clip/clip_0.stdout
-- spec/integration/clip/clip_1.cmd
-- spec/integration/clip/clip_1.stdout
-- spec/integration/coerce/coerce_1.cmd
-- spec/integration/coerce/coerce_1.stdout
-- spec/integration/compact/compact_0.cmd
-- spec/integration/compact/compact_0.stdout
-- spec/integration/defaults/defaults_0.cmd
-- spec/integration/defaults/defaults_0.stdout
-- spec/integration/defaults/defaults_1.cmd
-- spec/integration/defaults/defaults_1.stdout
-- spec/integration/defaults/defaults_2.cmd
-- 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
-- spec/integration/generator/generator_2.stdout
-- spec/integration/generator/generator_3.cmd
-- spec/integration/generator/generator_3.stdout
-- spec/integration/group/group_0.cmd
-- spec/integration/group/group_0.stdout
-- spec/integration/group/group_1.cmd
-- spec/integration/group/group_1.stdout
-- spec/integration/help/help_1.cmd
-- spec/integration/help/help_1.stdout
-- spec/integration/intersect/intersect_0.cmd
-- spec/integration/intersect/intersect_0.stdout
-- spec/integration/join/join_0.cmd
-- spec/integration/join/join_0.stdout
-- spec/integration/matching/matching_0.cmd
-- spec/integration/matching/matching_0.stdout
-- spec/integration/minus/minus_0.cmd
-- 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
-- spec/integration/project/project_1.stdout
-- spec/integration/quota/quota_0.cmd
-- spec/integration/quota/quota_0.stdout
-- spec/integration/rank/rank_1.cmd
-- spec/integration/rank/rank_1.stdout
-- spec/integration/rank/rank_2.cmd
-- spec/integration/rank/rank_2.stdout
-- spec/integration/rank/rank_3.cmd
-- spec/integration/rank/rank_3.stdout
-- spec/integration/rank/rank_4.cmd
-- spec/integration/rank/rank_4.stdout
-- spec/integration/rank/rank_5.cmd
-- spec/integration/rank/rank_5.stdout
-- spec/integration/rename/rename_0.cmd
-- spec/integration/rename/rename_0.stdout
-- spec/integration/restrict/restrict_0.cmd
-- spec/integration/restrict/restrict_0.stdout
-- spec/integration/restrict/restrict_1.cmd
-- spec/integration/restrict/restrict_1.stdout
+- spec/integration/explain/explain.cmd
+- spec/integration/explain/explain.stdout
+- spec/integration/show/group.alf
+- spec/integration/show/show_alf.cmd
+- spec/integration/show/show_alf.stdout
 - spec/integration/show/show_base.cmd
 - spec/integration/show/show_base.stdout
 - spec/integration/show/show_base_sort_1.cmd
@@ -259,73 +253,14 @@ files:
 - spec/integration/show/show_rash_pretty.stdout
 - spec/integration/show/show_yaml.cmd
 - spec/integration/show/show_yaml.stdout
-- spec/integration/sort/sort_0.cmd
-- spec/integration/sort/sort_0.stdout
-- spec/integration/sort/sort_1.cmd
-- spec/integration/sort/sort_1.stdout
-- spec/integration/sort/sort_2.cmd
-- spec/integration/sort/sort_2.stdout
-- spec/integration/sort/sort_3.cmd
-- spec/integration/sort/sort_3.stdout
-- spec/integration/summarize/summarize_0.cmd
-- spec/integration/summarize/summarize_0.stdout
 - spec/integration/test_shell.rb
-- spec/integration/union/union_0.cmd
-- spec/integration/union/union_0.stdout
-- spec/integration/unwrap/unwrap_0.cmd
-- spec/integration/unwrap/unwrap_0.stdout
-- spec/integration/wrap/wrap_0.cmd
-- 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
-- spec/unit/doc_manager/static.md
-- spec/unit/doc_manager/test_call.rb
-- spec/unit/ext/signature/test_argv2args.rb
-- spec/unit/ext/signature/test_to_shell.rb
-- spec/unit/from_argv/test_to_attr_list.rb
-- spec/unit/from_argv/test_to_attr_name.rb
-- spec/unit/from_argv/test_to_boolean.rb
-- spec/unit/from_argv/test_to_heading.rb
-- spec/unit/from_argv/test_to_ordering.rb
-- spec/unit/from_argv/test_to_predicate.rb
-- spec/unit/from_argv/test_to_renaming.rb
-- spec/unit/from_argv/test_to_size.rb
-- spec/unit/from_argv/test_to_summarization.rb
-- 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
-- spec/unit/operator/test_compact.rb
-- spec/unit/operator/test_defaults.rb
-- spec/unit/operator/test_extend.rb
-- spec/unit/operator/test_generator.rb
-- spec/unit/operator/test_group.rb
-- spec/unit/operator/test_infer_heading.rb
-- spec/unit/operator/test_intersect.rb
-- spec/unit/operator/test_join.rb
-- spec/unit/operator/test_matching.rb
-- spec/unit/operator/test_minus.rb
-- spec/unit/operator/test_not_matching.rb
-- spec/unit/operator/test_project.rb
-- spec/unit/operator/test_quota.rb
-- spec/unit/operator/test_rank.rb
-- spec/unit/operator/test_rename.rb
-- spec/unit/operator/test_restrict.rb
-- spec/unit/operator/test_sort.rb
-- spec/unit/operator/test_summarize.rb
-- spec/unit/operator/test_ungroup.rb
-- spec/unit/operator/test_union.rb
-- spec/unit/operator/test_unwrap.rb
-- spec/unit/operator/test_wrap.rb
+- tasks/doc.rake
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/alf-tool/alf-shell
@@ -342,13 +277,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1654527447503089080
+      hash: 1197934734732335619
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1197934734732335619
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25