krl 0.1.68 → 0.2.3

data/bin/krl

@@ -1,34 +1,10 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-#$DEBUG = true
-LIB_DIR = File.dirname(__FILE__) + "/../lib/"
-
-COMMANDS = {
-  "help" => lambda { |args| require LIB_DIR + 'help'; KRL_CMD::Help.go },
-  "apps" => lambda { |args| require LIB_DIR + 'apps'; KRL_CMD::Apps.go },
-  "checkout" => lambda { |args| require LIB_DIR + 'checkout'; KRL_CMD::Checkout.go(args) },
-  "create" => lambda { |args| require LIB_DIR + 'create'; KRL_CMD::Create.go(args) },
-  "update" => lambda { |args| require LIB_DIR + 'update'; KRL_CMD::Update.go(args) },
-  "versions" => lambda { |args| require LIB_DIR + 'versions'; KRL_CMD::Versions.go(args) },
-  "deploy" => lambda { |args| require LIB_DIR + 'deploy'; KRL_CMD::Deploy.go(args) },
-  "commit" => lambda { |args| require LIB_DIR + 'commit'; KRL_CMD::Commit.go(args) },
-  "show" => lambda { |args| require LIB_DIR + 'show'; KRL_CMD::Show.go(args) },
-  "note" => lambda { |args| require LIB_DIR + 'note'; KRL_CMD::Note.go(args) },
-  "check" => lambda { |args| require LIB_DIR + 'check'; KRL_CMD::Check.go(args) },
-  "generate" => lambda { |args| require LIB_DIR + 'generate'; KRL_CMD::Generate.go(args) },
-  "test" => lambda { |args| require LIB_DIR + 'test'; KRL_CMD::Test.go(args) },
-  "info" => lambda { |args| require LIB_DIR + 'info'; KRL_CMD::Info.go(args) }
-}
+require 'thor'
+require 'kynetx_am_api'
+require 'ap'
 
-banner = "Usage: krl <command> <args>\nUse 'krl help' for more information."
+#$DEBUG = true
 
-cmd = ARGV.shift
-if COMMANDS.keys.include? cmd
-  begin
-    COMMANDS[cmd].call(ARGV)
-  rescue Exception => e
-    puts "Error: #{e.message}"
-  end
-else
-  puts banner
-end
+require  File.dirname(__FILE__) + "/../lib/cli"
+KRL_CMD::CLI.start

data/lib/apps.rb

@@ -1,8 +1,6 @@
 module KRL_CMD
   class Apps
     def self.go
-      require LIB_DIR + 'user'
-      require LIB_DIR + 'common'
       user = User.new
       KRL_COMMON::pretty_table(user.applications["apps"], [
         {:field => "Ruleset ID", :value => lambda { |r| r["appid"] }},
@@ -11,4 +9,4 @@ module KRL_CMD
       ])
     end
   end
-end
+end

data/lib/check.rb

@@ -1,15 +1,14 @@
+require 'json'
 module KRL_CMD
   class Check
-    def self.go(args)
-      require LIB_DIR + 'common'
-      require 'json'
+    def self.go(options)
       app = KRL_COMMON::get_app
       krl_file = File.join(Dir.pwd, app.application_id + ".krl")
       raise "Cannot find .krl file." unless File.exists?(krl_file)
-      if args.to_s == ""
-        apiurl = "http://krl.kobj.net/manage/parse/ruleset"
+      if options["parser"]
+        apiurl = options["parser"]
       else
-        apiurl = args.to_s
+        apiurl = "http://krl.kobj.net/manage/parse/ruleset"
       end
       apiargs = { "krl" => File.open(krl_file, 'r') { |f| f.read } }
       validateresponse = KRL_COMMON::long_post_form(URI.parse(apiurl), apiargs).body.to_s

data/lib/checkout.rb

@@ -1,32 +1,67 @@
-require LIB_DIR + 'user'
 require 'fileutils'
 
 module KRL_CMD
   class Checkout
-    def self.go(args)
-			require LIB_DIR + 'common'
+
+    def self.go(ruleset, options)
+      begin
+        c = self.new(ruleset, options)
+        c.checkout
+      rescue Exception => e
+        puts e.message
+        ap e.backtrace if $DEBUG
+      end
+    end
+
+    def initialize(ruleset, options)
+      @user = User.new
+      @ruleset = ruleset
+      @include_title = options["title"] 
+      @all = options["all"]
       app = KRL_COMMON::get_app rescue nil
-			raise "You are already in an application: #{app.application_id}" if app
-
-      ruleset_id = args.to_s
-      puts "Checking out: #{ruleset_id}"
-      raise "Please specify a ruleset id." if ruleset_id.empty?
-      root_dir = Dir.pwd + "/#{ruleset_id}"
-      raise "Directory already exists." if File.exists?(root_dir)
-      user = User.new
-      app = user.find_application({:application_id => ruleset_id})
-      
-      puts "Creating directory: #{root_dir}"
-      FileUtils.mkdir root_dir
-      app_details = {
-        :name => app.name,
-        :ruleset_id => app.application_id,
-        :role => user.owns_current? ? "owner" : "developer"
-      }
-      File.open(root_dir + "/.app", "w") { |f| f.print(app_details.to_yaml) }
-      File.open(root_dir + "/#{ruleset_id}.krl", "w") { |f| f.print(app.krl) }
+			raise "You are already in an application directory: #{app.application_id}" if app
+    end
+
+    def checkout
+
+      if @all
+        @user.applications["apps"].each do |app|
+          begin
+            @ruleset = app["appid"]
+            do_checkout
+          rescue => e
+            puts e.message
+          end
+        end
+      else
+        do_checkout
+      end
 
       
     end
+
+    private
+
+    def do_checkout
+      app = @user.find_application({:application_id => @ruleset})
+      if app
+        dir_name = @include_title && app.name ? "#{@ruleset}-#{app.name}" : @ruleset
+        puts "Checking out: #{dir_name}"
+        root_dir = Dir.pwd + "/#{dir_name}"
+        raise "Directory already exists (#{root_dir})." if File.exists?(root_dir)
+        
+        puts "Creating directory: #{root_dir}"
+        FileUtils.mkdir root_dir
+        app_details = {
+          :name => app.name,
+          :ruleset_id => app.application_id,
+          :role => @user.owns_current? ? "owner" : "developer"
+        }
+        File.open(root_dir + "/.app", "w") { |f| f.print(app_details.to_yaml) }
+        File.open(root_dir + "/#{app.application_id}.krl", "w") { |f| f.print(app.krl) }
+      else
+        puts "Unable to find ruleset #{@ruleset}. You probably don't have permission to check it out."
+      end
+    end
   end
 end

data/lib/cli.rb

@@ -0,0 +1,229 @@
+module KRL_CMD
+  LIB_DIR = File.dirname(__FILE__) + "/../lib/"
+  %w(user apps checkout create update versions deploy
+     commit show note check generate test info stats).each do |cmd|
+    autoload cmd.capitalize.to_sym, LIB_DIR + cmd
+  end
+  autoload :KRL_COMMON, LIB_DIR + 'common'
+  
+
+  class CLI < Thor
+    
+    desc "apps", "Display a list of apps"
+    def apps
+      KRL_CMD::Apps.go
+    end
+
+    desc "checkout [RULESET]", "Creates a directory structure with the rulesets you have checked out."
+    #method_option  :type => :string, :required => true
+    method_option :title, :type => :boolean, :default => false, :aliases => "-t", :banner => "Include the title in the name of the directory."
+    method_option :all, :type => :boolean, :default => false, :aliases => "-a", :banner => "Checkout all of your rulesets into this directory."
+    #method_option :ruleset, :type => :string, :default => false, :aliases => "-r", :banner => "Ruleset ID, example: a1x1"
+    def checkout(ruleset="")
+      if ruleset.empty? && options["all"].nil?
+        say "Please specify either --ruleset or --all", :red
+        say help "checkout"
+      else
+        KRL_CMD::Checkout.go(ruleset, options)
+      end
+    end
+
+    desc "create [NAME]", "Creates a new ruleset and checks it out into the the directory."
+    method_option :title, :type => :boolean, :default => false, :aliases => "-t", :banner => "Include the name of the ruleset in the directory name"
+    method_option :description, :type => :string, :required => false, :aliases => "-d", :banner => "Description for the ruleset"
+    def create(name)
+      KRL_CMD::Create.go(name, options)
+    end
+    
+    desc "update", "Updates the krl in the ruleset directory to the a specified version."
+    method_option :version, :type => :string, :required => false, :default => "development", :aliases => "-v", :banner => "Version number or 'production' or 'development'"
+    method_option :save, :type => :boolean, :default => false, :aliases => '-s', :banner => "Save a copy of the existing .krl file"
+    def update
+      begin
+        KRL_CMD::Update.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "versions", "Displays a list of the ruleset versions."
+    method_option :limit, :type => :numeric, :default => 0, :aliases => "-l", :banner => "Limit the number of versions to show. 0 will show all available versions."
+    def versions
+      begin
+        KRL_CMD::Versions.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "deploy", "Deploys a given version to production. If no version is supplied, the latest version is deployed."
+    method_option :version, :type => :numeric, :required => false, :aliases => "-v", :banner => "Version to be deployed."
+    def deploy
+      begin
+        KRL_CMD::Deploy.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "commit", "Commits or saves the .krl file to the Kynetx platform."
+    method_option :note, :type => :string, :required => false, :aliases => "-n", :banner => "Add a note to the commit"
+    method_option :deploy, :type => :boolean, :required => false, :aliases => "-d", :banner => "Deploy the ruleset after it has been committed."
+    def commit 
+      begin
+        KRL_CMD::Commit.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "show", "Shows the krl for the ruleset for a given version"
+    method_option :version, :type => :string, :default => "development", :aliases => "-v", :banner => "Version of the KRL to show."
+    def show
+      begin
+        KRL_CMD::Show.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "note", "Adds a note to a ruleset version"
+    method_option :version, :type => :string, :default => "development", :aliases => "-v", :banner => "Version of the KRL to show."
+    method_option :note, :type => :string, :required => true, :aliases => "-n", :banner => "Note to be added."
+    def note
+      begin
+        KRL_CMD::Note.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "check", "Performs a syntax check of your KRL file."
+    method_option :parser, :type => :string, :required => false, :aliases => "-p", :banner => "Full URL to an alternate parser to check the krl against."
+    def check
+      begin
+        KRL_CMD::Check.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "generate [ENDPOINT]", "Generates an endpoint from the ruleset. Endpoint must be firefox, chrome, ie, bookmarklet, or infocard."
+    method_option :environment, :type => :string, :default => "prod", :aliases => "-e", :banner => "Environment. Must be either 'prod' or 'dev'."
+    method_option :defaults, :type => :boolean, :default => true, :aliases => "-d", :banner => "Use the defaults and don't prompt for more information."
+    method_option :force, :type => :boolean, :default => false, :aliases => "-f", :banner => "Force a rebuild of the endpoint rather than use the cached copy."
+    long_desc <<-D
+      Generates an endpoint for the ruleset. Endpoints are placed in the ./endpoints directory
+      or ./test directory depending on the environment specified.  Current endpoints available are:
+      firefox (Mozilla Firefox), chrome (Google Chrome), ie (Microsoft Internet Explorer), bookmarklet (HTML Bookmarklet), 
+      infocard (Info Card, see http://en.wikipedia.org/wiki/Information_Card). 
+      Infocards generated here are used in the Azigo Card Selector. 
+      See http://www.azigo.com
+    D
+    def generate(endpoint)
+      begin
+        KRL_CMD::Generate.go(endpoint, options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "test", "Test has been deprecated, use 'generate -e dev'"
+    def test
+      say "'test' has been deprecated. Use 'generate -e dev'", :red
+      help "generate"
+    end
+
+    desc "info", "Display information about a ruleset"
+    method_option :app, :type => :string, :required => false, :aliases => "-a", :banner => "Ruleset for which to show information"
+    def info
+      begin
+        KRL_CMD::Info.go(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "stats", "Display basic stats for the ruleset. NOTE: You must be the owner of the app to see stats."
+    method_option :range, :type => :string, :default => "previous_day", :aliases => "-r", :banner => "Specify the range for the stats." 
+    method_option :format, :type => :string, :default => "table", :aliases => "-f", :banner => "Format of the data. (table, json)"
+    def stats
+      begin
+        KRL_CMD::Stats.kpis(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "stats_interface", "Display the available options for running a stats query."
+    def stats_interface
+      begin
+        KRL_CMD::Stats.interface
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "account_stats", "Display stats for the Kynetx account."
+    method_option :range, :type => :string, :default => "previous_day", :aliases => "-r", :banner => "Specify the range for the stats." 
+    method_option :format, :type => :string, :default => "table", :aliases => "-f", :banner => "Format of the data. (table, json)"
+    def account_stats
+      begin
+        KRL_CMD::Stats.account_kpis(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "logging", "Displays values logged with explicit logging for the ruleset"
+    method_option :range, :type => :string, :default => "previous_day", :aliases => "-r", :banner => "Specify the range for the stats."
+    def logging
+      begin
+        KRL_CMD::Stats.logging(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+    desc "stats_query", "Build a custom stats query"
+    long_desc <<-D
+      Allows you to create a custom query for stats. Queries can be helpful for pulling
+      custom or ad-hoc data from the Kynetx data warehouse.
+
+      - Dimensions are fields that can be grouped and specified in a condition.
+
+      - KPIs, or sometimes called Facts, are data that is aggregated and cannot be included in a condition
+
+      - Contitions are specified in key value pairs, for example: 'dim:value' separated by a space.
+
+      - Ranges are preset date ranges for the query. All queries have a default range of 'previous_day'.
+
+      All available Dimensions, KPIs, and Ranges can be seen by running 'krl stats_interface'
+
+      Examples:\n
+      krl stats_query -k brse -d ruleset day -r last_thirty_days \n
+      krl stats_query -k rse brse -d am_pm hour interval_15 -r current_month -c hour:00 \n
+      krl stats_query -k rse brse -d am_pm hour interval_15 -r current_month -c hour:00 interval_15:00\n
+      krl stats_query -k brse -d day_of_week day -r current_month -c day_of_week_abbr:Wed
+
+      All data is available as both a table or as JSON. To specify the format, use the --format option.
+
+    D
+    method_option :kpis, :type => :array, :required => true, :aliases => "-k", :banner => ""
+    method_option :dims, :type => :array, :required => true, :aliases => "-d", :banner => ""
+    method_option :conditions, :type => :hash, :required => false, :aliases => "-c", :banner => "Conditions for the query as 'dim:value'."
+    method_option :range, :type => :string, :default => "previous_day", :aliases => "-r", :banner => "Specify the range for the stats." 
+    method_option :format, :type => :string, :default => "table", :aliases => "-f", :banner => "Format of the data. (table, json)"
+    def stats_query
+      begin
+        KRL_CMD::Stats.query(options)
+      rescue => e
+        say e.message, :red
+      end
+    end
+
+
+  end
+
+
+end

data/lib/commit.rb

@@ -1,14 +1,16 @@
 module KRL_CMD
   class Commit
-    def self.go(args)
-      require LIB_DIR + 'common'
+    def self.go(options)
       app = KRL_COMMON::get_app
       krl_file = File.join(Dir.pwd, app.application_id + ".krl")
       if File.exists?(krl_file)
         begin
           app.krl = File.open(krl_file, 'r') { |f| f.read }
-	  			app.set_version_note(app.version, args.to_s) if args.to_s != ""
-          puts "Committed version #{app.version}"
+	  			app.set_version_note(app.version, options["note"]) if options["note"]
+          puts "Committed version: #{app.version}"
+          if options["deploy"]
+            KRL_CMD::Deploy.go({"version" => app.version})
+          end
         rescue KRLParseError => e
           puts "Unable to parse your krl."
           puts "Errors:"

data/lib/common.rb

@@ -1,20 +1,32 @@
 require 'terminal-table/import'
 require 'net/http'
+require 'yaml'
 
 module KRL_COMMON
-  def self.pretty_table(collection, fields, limit=0)
+  def self.pretty_table(collection, fields, limit=0, limit_last=false)
+    raise "Nothing to present" if collection.empty?
     ptable = table do |t|
       
       t.headings = fields.collect{ |h| h[:field] }
       counter = 0
       collection.each do |c|
-        row = []
-        fields.each do |f|
-          row << f[:value].call(c)
+        show_row = true
+
+        if limit_last && limit > 0
+          # This will make it so that the last items in the table are
+          # shown rather than the first when a limit is specified.
+          show_row = (counter + 1) > (collection.length - limit)
+        end
+
+        if show_row
+          row = []
+          fields.each do |f|
+            row << f[:value].call(c) if show_row
+          end
+          t << row
         end
-        t << row
         counter += 1
-        break if limit > 0 && limit == counter
+        break if limit > 0 && limit == counter && ! limit_last
       end
       
     end
@@ -22,10 +34,9 @@ module KRL_COMMON
   end
   
   def self.get_app(version="development")
-    require LIB_DIR + "user"
     begin
       root_dir = Dir.pwd
-      raise "Please re-checkout your app or make sure you are in the root directory of an app." unless File.exists?(File.join(root_dir, ".app"))
+      raise "Please re-checkout your ruleset or make sure you are in the root directory of a ruleset." unless File.exists?(File.join(root_dir, ".app"))
       config_file = File.join(root_dir, '.app')
       raise "Unable to get the app information. You need to recheckout your app." unless File.exists?(config_file)
       config = YAML::load_file(config_file)
@@ -33,7 +44,7 @@ module KRL_COMMON
       app = user.find_application(:application_id => config[:ruleset_id], :version => version)
       return app
     rescue Exception => e
-      raise "Unable to get app information. #{e.message}"
+      raise "Unable to get ruleset information. #{e.message}"
     end
 
   end

data/lib/create.rb

@@ -1,15 +1,15 @@
 module KRL_CMD
   class Create
-    def self.go(args)
-      raise "An application name must be specified" if args.to_s.empty?
-      name = args.first
-      desc = args.last # if description wasn't specified, set it to the name
-      require LIB_DIR + 'user'
-      require LIB_DIR + 'checkout'      
+    def self.go(name, options)
+      desc = options["description"] ? options["description"] : name
       user = KRL_CMD::User.new
       new_app = user.create_application(name, desc)
-      KRL_CMD::Checkout.go(new_app.application_id)
+      checkout_opts = {
+        "ruleset" => new_app.application_id,
+        "title" => options["title"]
+      }
+      KRL_CMD::Checkout.go(checkout_opts)
       
     end
   end
-end
+end

data/lib/deploy.rb

@@ -1,12 +1,10 @@
 module KRL_CMD
   class Deploy
-    def self.go(args)
-      require LIB_DIR + 'common'
+    def self.go(options)
       app = KRL_COMMON::get_app
-      prod_version = args.to_s.empty? ? app.version : args.to_s.to_i
+      prod_version = options["version"] ? options["version"] : app.version
       app.production_version = prod_version
       puts "Deployed version: #{app.production_version}"
-      
     end
   end
-end
+end

data/lib/generate.rb

@@ -7,48 +7,68 @@ require 'launchy'
 
 module KRL_CMD
   class Generate
-    def self.go(args)
-      raise "Please specify an endpoint to generate" if args.to_s.empty?   
-      type = args.shift
+    include Thor::Shell
+    def self.go(endpoint, options)
+      g = self.new(endpoint,options)
+    end
+      
+    def initialize(endpoint, options)
+      @shell = Basic.new
+      @endpoint = endpoint
+      @environment = options["environment"]
+      @use_defaults = options["defaults"]
+      @force = options["force"]
+      @app = KRL_COMMON::get_app  
+      @user = KRL_CMD::User.new
       endpoints = {
-        "firefox" => lambda {gen_extension(type, args)},
-        "chrome" => lambda {gen_extension(type, args)},
-        "ie" => lambda {gen_extension(type, args)},
-        "bookmarklet" => lambda {gen_bookmarklet(args)},
-        "infocard" => lambda {gen_infocard(args)}
+        "firefox" => lambda {gen_extension},
+        "chrome" => lambda {gen_extension},
+        "ie" => lambda {gen_extension},
+        "bookmarklet" => lambda {gen_bookmarklet},
+        "infocard" => lambda {gen_infocard}
       }
-      if endpoints[type]
-        endpoints[type].call
+      if endpoints[@endpoint]
+        endpoints[@endpoint].call
       else
-        raise "Unknown endpoint specified (#{type})"
+        raise "Unknown endpoint specified (#{@endpoint})"
       end
+
       
     end
     
-    def self.gen_extension(type, args, env='prod')
-      puts "Generating Extension (#{type.to_s}) #{args.join(', ')}"
-      # ext = app.extension(type, args[0] || "", args[1] || "", args[2] || "" )
-      # write_file(ext, "prod")   
+    def gen_extension
+      puts "Generating Extension (#{@endpoint} - #{@environment})"
+
+      if @use_defaults
+        extname, extauthor, extdesc = "", "", ""
+      else
+        extname = @shell.ask("Name of the extension (#{@app.name}):")
+        extauthor = @shell.ask("Name of the author (#{@user.name}):")
+        extdesc = @shell.ask("Description:")
+      end
      
       opts = {}
-      opts[:extname] = args[0] if args[0]
-      opts[:extauthor] = args[1] if args[1]
-      opts[:extdesc] = args[2] if args[2]
-      opts[:env] = env
+      opts[:extname] = extname unless extname.empty? 
+      opts[:extauthor] = extauthor unless extauthor.empty? 
+      opts[:extdesc] = extdesc unless extdesc.empty?
+      opts[:env] = @environment
+      opts[:force_build] = @force ? "Y" : "N"
       opts[:format] = 'url'
 
-      ext = app.endpoint(type, opts)
-      write_file(ext, env)      
+      ext = @app.endpoint(@endpoint, opts)
+      write_file(ext)      
     end
     
-    def self.gen_bookmarklet(args, env="prod")
-      puts "Generating Bookmarklet (#{env})"
+    def gen_bookmarklet
+      puts "Generating Bookmarklet (#{@environment})"
       bm = ""
       opts = {}
-      opts[:env] = env
-      opts[:runtime] = args.to_s unless args.to_s.empty?
+      opts[:env] = @environment
+      if ! @use_defaults
+        opts[:runtime] = @shell.ask("Runtime to use for the bookmarklet (blank for default):")
+      end
 
-      endpoint = app.endpoint(:bookmarklet, opts)
+      endpoint = @app.endpoint(:bookmarklet, opts)
       
       if endpoint["errors"].empty?
         bm = endpoint["data"]
@@ -56,10 +76,10 @@ module KRL_CMD
         raise "Invalid bookmark generated. \n#{endpoint.errors.join("\n")}"
       end
       
-      bm_file = File.join(get_endpoint_dir(env), env + "_bookmarklet.html")
+      bm_file = File.join(get_endpoint_dir, @environment + "_bookmarklet.html")
       File.open(bm_file, 'w') do |f|
         f.print("<textarea rows='5' cols='100'>#{bm}</textarea><br><br>")
-        link = env == "prod" ? app.name : env + "_" + app.name
+        link = @environment == "prod" ? @app.name : @environment + "_" + @app.name
         f.print("<a href=\"#{bm.gsub('"', '&quot;')}\">#{link}</a>")
       end
       puts "BOOKMARKLET:"
@@ -69,36 +89,40 @@ module KRL_CMD
       Launchy::Browser.run('file://' + bm_file)
     end
     
-    def self.gen_infocard(args, env="prod")
-      raise "You must specify a name for the card" if args.empty?
-      puts "Generating Infocard (#{env})"
+    def gen_infocard
+      puts "Generating Infocard (#{@environment})"
+
+      if @use_defaults
+        extname = ""
+        datasets = ""
+      else
+        extname = @shell.ask("Name of the infocard (#{@app.name}):")
+        datasets = @shell.ask("Datasets:")
+      end
+
       opts = {}
-      opts[:extname] = args[0] if args[0]
-      opts[:datasets] = args[1] if args[1]
-      opts[:env] = env
+      opts[:extname] = extname unless extname.empty?
+      opts[:datasets] = datasets unless datasets.empty?
+      opts[:env] = @environment
       opts[:format] = 'url'
 
-      icard = app.endpoint(:info_card, opts)
-      write_file(icard, env)
+      icard = @app.endpoint(:info_card, opts)
+      write_file(icard)
     end
     
-    def self.app
-      return @@app if defined?@@app
-      require LIB_DIR + 'common'
-      @@app = KRL_COMMON::get_app 
-      return @@app
-    end
-    
-    def self.get_endpoint_dir(env)
-      dir_name = env == "prod" ? "/endpoints" : "/test"
+    private
+
+    def get_endpoint_dir
+      dir_name = @environment == "prod" ? "/endpoints" : "/test"
       endpoint_dir = Dir.pwd + dir_name
       FileUtils.mkdir(endpoint_dir) unless File.directory?(endpoint_dir)
       return endpoint_dir
     end
     
-    def self.write_file(ext, env)
+    
+    def write_file(ext)
       if ext["errors"].empty?
-        endpoint_dir = get_endpoint_dir(env)
+        endpoint_dir = get_endpoint_dir
         ext_file_name = File.join(endpoint_dir, ext["file_name"])
         url = URI.parse(ext["data"])
 

data/lib/info.rb

@@ -1,17 +1,14 @@
 module KRL_CMD
   class Info
-    def self.go(args)
-      require LIB_DIR + 'user'
-      require LIB_DIR + 'common'
-      require 'pp'
+    def self.go(options)
       user = User.new
       app_id = nil
-      if(args.length > 0)
-        app_id = args[0]
+      if(options["app"] && options["app"].length > 0)
+        app_id = options["app"]
       else
         app_id = KRL_COMMON::get_app().application_id rescue nil
       end
-      raise "Unable to determine the application id. use 'krl help' for more information." unless app_id
+      raise "Unable to determine the application id. Use 'krl help info' for more information." unless app_id
       
       app_info = user.api.get_app_info(app_id)
       app_details = user.api.get_app_details(app_id)
@@ -43,4 +40,4 @@ module KRL_CMD
       end
     end
   end
-end
+end

data/lib/note.rb

@@ -1,13 +1,11 @@
 module KRL_CMD
   class Note
-    def self.go(args)
-      raise "Please supply a version and a note. (note must be enclosed in quotes)" unless args.length == 2
-      version = args.first.to_i
-      note = args.last.to_s
-      require LIB_DIR + 'common'
+    def self.go(options)
       app = KRL_COMMON::get_app
+      version = options["version"] ? options["version"] : app.version
+      note = options["note"]
       app.set_version_note(version, note)
       puts "Done."      
     end
   end
-end
+end

data/lib/show.rb

@@ -1,11 +1,10 @@
 module KRL_CMD
   class Show
-    def self.go(args)
-      version = args.to_s.empty? ? "development" : args.to_s.to_i
-      require LIB_DIR + 'common'
+    def self.go(options)
+      version = options["version"]
       app = KRL_COMMON::get_app
       puts "KRL for version #{version}"      
       puts app.krl(version)
     end
   end
-end
+end

data/lib/stats.rb

@@ -0,0 +1,110 @@
+require 'json'
+module KRL_CMD
+  class Stats
+    def self.interface
+      user = KRL_CMD::User.new
+      begin
+        p_interface = user.stats_interface
+        puts "-- Dimensions --"
+        p_interface["dims"].each {|s| puts "\t" + s}
+        puts
+        puts "-- KPIS --"
+        p_interface["kpis"].each {|s| puts "\t" + s}
+        puts
+        puts "-- Ranges --"
+        p_interface["ranges"].each {|s| puts "\t" + s}
+      rescue 
+        raise "There was an error trying to retrieve the stats interface"
+      end
+    end
+
+    def self.kpis(options)
+      app = KRL_COMMON::get_app
+      begin
+        data = app.kpis(options["range"])
+        display_stats(data, %w(DAY RSE BRSE CALLBACKS RULES RULES_FIRED ACTIONS), options["format"]) 
+      rescue => e
+        ap e.message if $DEBUG
+        ap e.backtrace if $DEBUG
+        raise e.message
+      end
+      
+    end
+
+    def self.account_kpis(options)
+      user = KRL_CMD::User.new
+      begin
+        data = user.kpis([], options["range"])
+        display_stats(data, %w(RULESET DAY RSE BRSE CALLBACKS RULES RULES_FIRED ACTIONS), options["format"]) 
+      rescue => e
+        ap e.message if $DEBUG
+        ap e.backtrace if $DEBUG
+        raise e.message
+      end 
+    end
+
+    def self.logging(options)
+      app = KRL_COMMON::get_app
+      begin
+        data = app.logging(options["range"])
+        display_stats(data, [], "json")
+      rescue => e
+        ap e.message if $DEBUG
+        ap e.backtrace if $DEBUG
+        raise e.message
+      end 
+    end
+
+    def self.query(options)
+      user = KRL_CMD::User.new
+      if options["conditions"]
+        conditions = []
+        options["conditions"].each {|k,v| conditions << {:field => k, :value => v}}
+      else
+        conditions = nil
+      end
+      begin
+        data = user.api.get_stats_query(
+          options["kpis"].join(","),
+          options["dims"].join(","),
+          conditions,
+          options["range"]
+        )
+        fields = []
+        (options["dims"] + options["kpis"]).each {|v| fields << v.upcase}
+        display_stats(data, fields, options["format"])
+
+      rescue => e
+        ap e.message   #if $DEBUG
+        ap e.backtrace #if $DEBUG
+        raise "Unable to retrieve query results. #{e.message}"
+      end 
+    end
+
+
+    private
+
+
+    def self.display_stats(data, fields, format)
+      field_opts = []
+      fields.each do |field|
+        field_opts << {:field => field, :value => lambda { |r| r[field].to_s }}
+      end
+      if data["valid"] == true
+        if format == "table"
+          KRL_COMMON.pretty_table(data["data"], field_opts)
+        elsif format == "json"
+          puts JSON.pretty_generate(data["data"])
+        else
+          raise "Unknown format (#{format})"
+        end
+
+      else
+        raise data["error"]
+      end
+
+      
+    end
+      
+  end
+end

data/lib/update.rb

@@ -1,12 +1,20 @@
+require 'fileutils'
 module KRL_CMD
   class Update
-    def self.go(args)
-      version = args.to_s.empty? ? "development" : args.to_s.to_i
-      require LIB_DIR + 'common'
+    def self.go(options)
+      version = options["version"]
       app = KRL_COMMON::get_app
       root_dir = Dir.pwd
-      File.open(File.join(Dir.pwd, app.application_id + ".krl"), "w") { |f| f.print(app.krl(version)) }
+      krl_file = File.join(Dir.pwd, app.application_id + ".krl")
+
+      if File.exists?(krl_file) && options["save"]
+        backup_file = app.application_id + ".saved.krl"
+        raise "Backup file already exists (#{backup_file}). Your krl was not updated. Please rename or delete your existing backup file." if File.exists?(backup_file)
+        FileUtils.cp(krl_file, backup_file)
+      end
+
+      File.open(krl_file, "w") { |f| f.print(app.krl(version)) }
       puts "Updated to version: #{version}"
     end
   end
-end
+end

data/lib/versions.rb

@@ -1,8 +1,7 @@
 module KRL_CMD
   class Versions
-    def self.go(args)
-      require LIB_DIR + 'common'
-      limit = args.to_s.to_i
+    def self.go(options)
+      limit = options["limit"]
       app = KRL_COMMON::get_app
       p_version = app.production_version.to_i
       KRL_COMMON::pretty_table(app.versions.reverse, [
@@ -11,7 +10,7 @@ module KRL_CMD
         {:field => "Date", :value => lambda { |r| r["created"].to_s }},
         {:field => "Note", :value => lambda { |r| r["note"].to_s }},
         {:field => "Production", :value => lambda { |r| r["version"] == p_version ? "Yes" : "No" }}
-      ], limit)
+      ], limit, ! limit.nil?)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: krl
 version: !ruby/object:Gem::Version 
-  hash: 147
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 68
-  version: 0.1.68
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michael Farmer, Cid Dennis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -06:00
+date: 2010-12-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 39
         segments: 
         - 0
         - 1
-        - 29
-        version: 0.1.29
+        - 30
+        version: 0.1.30
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: awesome_print
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,8 +91,38 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
+        version: 0.14.6
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: "    Build your Kynetx applications with the IDE of your choice! Installing the krl gem will give you \n    command line tools that provides a simple interface that is similar to git or svn.\n"
 email: mjf@kynetx.com
 executables: 
@@ -106,6 +136,7 @@ files:
 - lib/apps.rb
 - lib/check.rb
 - lib/checkout.rb
+- lib/cli.rb
 - lib/commit.rb
 - lib/common.rb
 - lib/create.rb
@@ -115,6 +146,7 @@ files:
 - lib/info.rb
 - lib/note.rb
 - lib/show.rb
+- lib/stats.rb
 - lib/test.rb
 - lib/update.rb
 - lib/user.rb