flydata 0.0.5.4 → 0.0.5.5

data/Gemfile

@@ -1,21 +1,18 @@
 source "http://rubygems.org"
 
-gem "rest-client"
-gem "i18n"
-gem "activesupport"
-gem "json"
-gem "highline"
+gem "rest-client", "~> 1.6.7"
+gem "i18n", "~> 0.6.5"
+gem "activesupport", "~> 4.0.0"
+gem "json", "~> 1.8.0"
+gem "highline", "~> 1.6.19"
 gem "fluentd", "0.10.35"
 
 group :development do
   gem "bundler"
   gem "jeweler"
   gem "rspec"
-  gem "autotest"
-  gem "autotest-standalone"
-  gem "autotest-notification"
-  gem "ZenTest"
-  gem "activemodel"
-  gem "activerecord"
+  #gem "autotest"
+  #gem "autotest-standalone"
+  #gem "autotest-notification"
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -1,82 +1,97 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.8.2)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    autotest-notification (2.3.4)
-      autotest-standalone (~> 4.5)
-    autotest-standalone (4.5.9)
-    builder (3.0.4)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    atomic (1.1.14)
+    builder (3.2.2)
     cool.io (1.1.1)
       iobuffer (>= 1.0.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     fluentd (0.10.35)
       cool.io (~> 1.1.0)
       http_parser.rb (~> 0.5.1)
       json (>= 1.4.3)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       yajl-ruby (~> 1.0)
-    git (1.2.5)
-    highline (1.6.15)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
     http_parser.rb (0.5.3)
-    i18n (0.6.1)
+    httpauth (0.2.0)
+    i18n (0.6.5)
     iobuffer (1.1.2)
-    jeweler (1.8.4)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    mime-types (1.19)
-    msgpack (0.5.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mime-types (1.25)
+    minitest (4.7.5)
+    msgpack (0.5.6)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
-  activemodel
-  activerecord
-  activesupport
-  autotest
-  autotest-notification
-  autotest-standalone
+  activesupport (~> 4.0.0)
   bundler
   fluentd (= 0.10.35)
-  highline
-  i18n
+  highline (~> 1.6.19)
+  i18n (~> 0.6.5)
   jeweler
-  json
-  rest-client
+  json (~> 1.8.0)
+  rest-client (~> 1.6.7)
   rspec
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.5.4
+0.0.5.5

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.5.4"
+  s.version = "0.0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2013-10-11"
+  s.date = "2013-10-18"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -66,56 +66,38 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.6.5"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.0.0"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.8.0"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.6.19"])
       s.add_runtime_dependency(%q<fluentd>, ["= 0.10.35"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<autotest>, [">= 0"])
-      s.add_development_dependency(%q<autotest-standalone>, [">= 0"])
-      s.add_development_dependency(%q<autotest-notification>, [">= 0"])
-      s.add_development_dependency(%q<ZenTest>, [">= 0"])
-      s.add_development_dependency(%q<activemodel>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_dependency(%q<i18n>, ["~> 0.6.5"])
+      s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
+      s.add_dependency(%q<json>, ["~> 1.8.0"])
+      s.add_dependency(%q<highline>, ["~> 1.6.19"])
       s.add_dependency(%q<fluentd>, ["= 0.10.35"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<autotest>, [">= 0"])
-      s.add_dependency(%q<autotest-standalone>, [">= 0"])
-      s.add_dependency(%q<autotest-notification>, [">= 0"])
-      s.add_dependency(%q<ZenTest>, [">= 0"])
-      s.add_dependency(%q<activemodel>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    s.add_dependency(%q<i18n>, ["~> 0.6.5"])
+    s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
+    s.add_dependency(%q<json>, ["~> 1.8.0"])
+    s.add_dependency(%q<highline>, ["~> 1.6.19"])
     s.add_dependency(%q<fluentd>, ["= 0.10.35"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<autotest>, [">= 0"])
-    s.add_dependency(%q<autotest-standalone>, [">= 0"])
-    s.add_dependency(%q<autotest-notification>, [">= 0"])
-    s.add_dependency(%q<ZenTest>, [">= 0"])
-    s.add_dependency(%q<activemodel>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

data/lib/flydata/command/setup.rb

@@ -11,9 +11,10 @@ module Flydata
       ENTER_TABLE_NAME = '-- Create a table on Redshift from your logs --'
 
       # readline settings for asking log path
-      Readline.completion_append_character = "/"
-      Readline.completion_proc = Proc.new do |str|
-        Dir[str+'*'].grep( /^#{Regexp.escape(str)}/ )
+      Readline.completion_append_character = nil
+      Readline.completion_proc = lambda do |prefix|
+        files = Dir["#{prefix}*"]
+        files.map { |f| File.expand_path(f) }.map { |f| File.directory?(f) ? f + "/" : f }
       end
 
       def initial_run
@@ -68,7 +69,10 @@ module Flydata
 
       def show_registered_redshift_entries
         show_registered_entries('RedshiftFileDataEntry') do |de|
-          say(" - #{de['display_name']}: #{de['log_path']} -> #{de['redshift_table_name']} (#{de['redshift_table_name']}_dev)")
+          sn = de['redshift_schema_name']
+          tn = de['redshift_table_name']
+          table_name = sn.to_s.empty? ? tn : "#{sn}.#{tn}"
+          say(" - #{de['display_name']}: #{de['log_path']} -> #{table_name} (#{table_name}_dev)")
         end
       end
 
@@ -153,13 +157,18 @@ module Flydata
         end
       end
 
-      def create_redshift_log_entry(log_path, log_file_type, redshift_table_name)
+      def create_redshift_log_entry(log_path, log_file_type, table_name)
+        if table_name.include?(".")
+          schema_name, table_name = table_name.split(".")
+        end
         data_port = flydata.data_port.get
         flydata.data_entry.create(
           data_port_id: data_port['id'],
           log_path: log_path,
           log_file_type: log_file_type,
-          redshift_table_name: redshift_table_name)
+          redshift_table_name: table_name,
+          redshift_schema_name: schema_name,
+        )
         say("Process added successfuly!")
         return true
       end
@@ -315,9 +324,10 @@ module Flydata
         input = nil
         loop do
           say("Enter a table name for Redshift to store your logs. This table will be created automatically.")
+          say("Input format: [table-name] or [schema-name].[table-name]")
           say(">> ")
           input = gets.strip
-          if input =~ /^[a-zA-Z0-9_]+$/
+          if input =~ /^([a-zA-Z0-9_][a-zA-Z0-9_$]*\.)?[a-zA-Z0-9_][a-zA-Z0-9_$]*$/
             break
           else
             puts "!Please enter the valid table name."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.5.4
+  version: 0.0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,88 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.19
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -155,102 +155,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest-standalone
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest-notification
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1029237572235561937
+      hash: 3003976243049248433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: