mycmd 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4032fa8d14c8bef5767ba0e34e6a43ca9102a5f2
-  data.tar.gz: 0bdfd6067cadebe7fdb73ce724566bd264d8256e
+  metadata.gz: ca8366a87ff73ce76f56bdeadaea36a3b5fa79d2
+  data.tar.gz: cfc34ad1fca34a425ca10c2dcdbaeec68dfc11be
 SHA512:
-  metadata.gz: 0203fe3e2003fdeb3f210e59b8a0c37887f2322beeb507aa801e8724029279db7af1fe396a80f04372df02c43d869b33ef622b2fab3801d81f5d155d847668ee
-  data.tar.gz: 9057067f77ee44feb682d5198a022dbf38cc850a4f17729cf78294878c990efbe7ef2c58068fb1aa014d1f33d54f7ae92558bbef0eff0c5a8c825d53ba385f8c
+  metadata.gz: 961aad1654773f7697114fea426ca74b7bb46943c15bc951b9bb008fbec557a6359249d4292320688e565093c792126e6ed41d17b88fee55fcbcdefbe1a0349a
+  data.tar.gz: 1667d1e50b020bf2fe045a722c1e206e52f54b299a181532aafff52ce013835aa36cc38391bbe8a740c0cbc054c5e035c3326b9e88bddc0d0e41948e0db70168

data/README.md

@@ -21,6 +21,10 @@ Or install it yourself as:
 
     $ gem install mycmd
 
+Or clone from Github:
+
+    $ git clone https://github.com/i2bskn/mycmd.git
+
 ## Settings
 
 Create settings file:

data/bin/mycmd

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-$:.unshift(File.expand_path("../../lib", __FILE__))
+path = File.expand_path("../../lib", __FILE__)
+$:.unshift(path) unless $:.include?(path)
 require "mycmd"
 
-Mycmd::CLI.start
+Mycmd::CLI.start

data/lib/mycmd.rb

@@ -5,4 +5,5 @@ require "mysql2"
 require "mycmd/version"
 require "mycmd/configuration"
 require "mycmd/printer"
+require "mycmd/client"
 require "mycmd/cli"

data/lib/mycmd/cli.rb

@@ -30,17 +30,12 @@ module Mycmd
 
     desc 'query "[SQL]"', "query will execute sql."
     def query(sql)
-      client = Configuration.connect
-      printer = Printer.new(client.query(sql), true)
-      printer.print
+      Client.query(sql).print
     end
 
-    desc 'tasks [TASK NAME]', "tasks will execute register sql."
+    desc 'tasks [TASK NAME]p', "tasks will execute register sql."
     def tasks(task)
-      config = Configuration.new
-      client = config.connect
-      printer = Printer.new(client.query(config.tasks[task.to_s]), true)
-      printer.print
+      Client.execute_task(task).print
     end
   end
 end

data/lib/mycmd/client.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+module Mycmd
+  class Client
+    def initialize
+      @configuration = Configuration.new
+      @connection = @configuration.connect
+    end
+
+    def query(sql)
+      @result = @connection.query(sql)
+      self
+    end
+
+    def execute_task(task)
+      @result = @connection.query(@configuration.tasks[task.to_s])
+      self
+    end
+
+    def print(header=true)
+      Printer.new(@result, header).print
+    end
+
+    class << self
+      def method_missing(action, *args)
+        client = self.new
+        if client.respond_to? action
+          client.send(action, *args)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/mycmd/clis/status_commands.rb

@@ -12,9 +12,7 @@ module Mycmd
       else
         sql = "SELECT T.TABLE_NAME, CAST(((T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) AS SIZE_MB FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = '#{options['database']}' UNION SELECT 'all_tables', CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = '#{options['database']}'"
       end
-      client = Configuration.connect
-      printer = Printer.new(client.query(sql), true)
-      printer.print
+      Client.query(sql).print
     end
 
     desc "qcache_hit_rate", "qcache_hit_rate will print query cache hit rate"

data/lib/mycmd/printer.rb

@@ -6,8 +6,13 @@ module Mycmd
     attr_accessor :result, :header, :width
     
     def initialize(result, header=false)
-      @result = result.is_a?(Mysql2::Result) ? result_to_array(result) : result
-      @header = result.is_a?(Mysql2::Result) ? result.fields : header
+      @header = header
+      if result.is_a? Mysql2::Result
+        @result = result_to_array(result)
+        @header = result.fields if @header
+      else
+        @result = result
+      end
     end
 
     def print

data/lib/mycmd/version.rb

@@ -1,3 +1,3 @@
 module Mycmd
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/mycmd/cli_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe Mycmd::CLI do
+  let(:client) {double("client mock").as_null_object}
+
   let(:conn_mock) {double("connection mock").as_null_object}
   let(:printer_mock) {double("printer mock").as_null_object}
 
@@ -31,10 +33,7 @@ describe Mycmd::CLI do
   end
 
   describe "#query" do
-    before do
-      Mycmd::Configuration.stub(:connect).and_return(conn_mock)
-      Mycmd::Printer.stub(:new).and_return(printer_mock)
-    end
+    before {Mycmd::Client.stub(:query).and_return(client)}
 
     after do
       expect {
@@ -42,48 +41,30 @@ describe Mycmd::CLI do
       }.not_to raise_error
     end
 
-    it "should call Configuration.connect" do
-      Mycmd::Configuration.should_receive(:connect).and_return(conn_mock)
+    it "should call Client.#query" do
+      Mycmd::Client.should_receive(:query).and_return(client)
     end
 
-    it "should create Printer object" do
-      Mycmd::Printer.should_receive(:new).with(conn_mock, true).and_return(printer_mock)
-    end
-
-    it "should call Printer#print" do
-      printer_mock.should_receive(:print)
+    it "should call Client#print" do
+      client.should_receive(:print)
     end
   end
 
   describe "#tasks" do
-    let(:config_mock) {double("configuration mock").as_null_object}
-
-    before do
-      config_mock.stub(:connect).and_return(conn_mock)
-      Mycmd::Configuration.stub(:new).and_return(config_mock)
-      Mycmd::Printer.stub(:new).and_return(printer_mock)
-    end
+    before {Mycmd::Client.stub(:execute_task).and_return(client)}
 
     after do
       expect {
-        Mycmd::CLI.start(["tasks", "some task"])
+        Mycmd::CLI.start(["tasks", "some_task"])
       }.not_to raise_error
     end
 
-    it "should create Configuration object" do
-      Mycmd::Configuration.should_receive(:new).and_return(config_mock)
-    end
-
-    it "should call Configuration#connect" do
-      config_mock.should_receive(:connect).and_return(conn_mock)
-    end
-
-    it "should create Printer object" do
-      Mycmd::Printer.should_receive(:new).with(conn_mock, true).and_return(printer_mock)
+    it "should call Client.#execute_task" do
+      Mycmd::Client.should_receive(:execute_task).and_return(client)
     end
 
-    it "should call Printer#print" do
-      printer_mock.should_receive(:print)
+    it "should call Client#print" do
+      client.should_receive(:print)
     end
   end
 end

data/spec/mycmd/client_spec.rb

@@ -0,0 +1,107 @@
+require "spec_helper"
+
+describe Mycmd::Client do
+  let(:client) {Mycmd::Client.new}
+  let(:connection) {double("Mysql2::Client Mock").as_null_object}
+  let(:config) {double("Mycmd::Configuration Mock").as_null_object}
+
+  describe "#initialize" do
+    it "should generate Configuration object" do
+      Mycmd::Configuration.should_receive(:new).and_return(config)
+      Mycmd::Client.new
+    end
+
+    it "should call Configuration#connect" do
+      config.should_receive(:connect)
+      Mycmd::Configuration.should_receive(:new).and_return(config)
+      Mycmd::Client.new
+    end
+  end
+
+  describe "#query" do
+    before do
+      config.stub(:connect).and_return(connection)
+      Mycmd::Configuration.stub(:new).and_return(config)
+    end
+
+    it "should call Mysql2::Client#query" do
+      connection.should_receive(:query)
+      client.query("some sql")
+    end
+
+    it "should set result" do
+      connection.should_receive(:query).and_return("result")
+      client.query("some sql")
+      expect(client.instance_eval{@result}).not_to be_nil
+    end
+
+    it "returns Mycmd::Client object" do
+      expect(client.query("some sql").is_a? Mycmd::Client).to be_true
+    end
+  end
+
+  describe "#execute_task" do
+    before do
+      config.stub(:connect).and_return(connection)
+      Mycmd::Configuration.stub(:new).and_return(config)
+    end
+
+    it "should call Mysql2::Client#query" do
+      connection.should_receive(:query)
+      client.execute_task("some_task")
+    end
+
+    it "should set result" do
+      connection.should_receive(:query).and_return("result")
+      client.execute_task("some_task")
+      expect(client.instance_eval{@result}).not_to be_nil
+    end
+
+    it "returns Mycmd::Client object" do
+      expect(client.execute_task("some_task").is_a? Mycmd::Client).to be_true
+    end
+  end
+
+  describe "#print" do
+    let(:printer) {double("Mycmd::Printer Mock").as_null_object}
+
+    before do
+      config.stub(:connect).and_return(connection)
+      Mycmd::Configuration.stub(:new).and_return(config)
+    end
+
+    it "should create Mycmd::Printer object" do
+      Mycmd::Printer.should_receive(:new).and_return(printer)
+      client.print
+    end
+
+    it "should call Mycmd::Printer#print" do
+      printer.should_receive(:print)
+      Mycmd::Printer.stub(:new).and_return(printer)
+      client.print
+    end
+  end
+
+  describe ".#method_missing" do
+    before do
+      connection.stub(:query)
+      config.stub(:connect).and_return(connection)
+      Mycmd::Configuration.stub(:new).and_return(config)
+    end
+
+    context "with known method" do
+      it "should call Mycmd::Client#query" do
+        Mycmd::Client.any_instance.should_receive(:query)
+        Mycmd::Client.query("some sql")
+      end
+    end
+
+    context "with unknown method" do
+      it "should generate exception" do
+        expect {
+          Mycmd::Client.unknown_method
+        }.to raise_error
+      end
+    end
+  end
+end

data/spec/mycmd/clis/status_commands_spec.rb

@@ -4,38 +4,38 @@ describe Mycmd::StatusCommands do
   let(:conn_mock) {double("connection mock")}
 
   describe "#size" do
-    let(:ptr_mock) {double("printer mock").as_null_object}
-
-    before do
-      conn_mock.stub(:query).and_return(create_result)
-      Mycmd::Configuration.stub(:connect).and_return(conn_mock)
-      Mycmd::Printer.stub(:new).and_return(ptr_mock)
-    end
+    let(:client) {double("Mycmd::Client Mock").as_null_object}
 
     context "with not arguments" do
       let(:args) {["size"]}
+      let(:sql) {"SELECT T.TABLE_SCHEMA, CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) AS SIZE_MB FROM INFORMATION_SCHEMA.TABLES AS T GROUP BY T.TABLE_SCHEMA UNION SELECT 'all_databases', CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) FROM INFORMATION_SCHEMA.TABLES AS T"}
+
       after {Mycmd::StatusCommands.start(args)}
 
-      it "should call Configuration.#connect" do
-        Mycmd::Configuration.should_receive(:connect).and_return(conn_mock)
+      it "should call Mycmd::Client.#query" do
+        Mycmd::Client.should_receive(:query).with(sql).and_return(client)
       end
 
-      it "should create Printer object" do
-        Mycmd::Printer.should_receive(:new).and_return(ptr_mock)
+      it "should call Mycmd::Client#print" do
+        client.should_receive(:print)
+        Mycmd::Client.stub(:query).and_return(client)
       end
+    end
 
-      it "should call Printer#print" do
-        ptr_mock.should_receive(:print)
-      end
+    context "with arguments" do
+      let(:args) {["size", "-d", "some_db"]}
+      let(:sql) {"SELECT T.TABLE_NAME, CAST(((T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) AS SIZE_MB FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = 'some_db' UNION SELECT 'all_tables', CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = 'some_db'"}
+
+      after {Mycmd::StatusCommands.start(args)}
 
-      it "should output the size of all databases" do
-        conn_mock.should_receive(:query).with("SELECT T.TABLE_SCHEMA, CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) AS SIZE_MB FROM INFORMATION_SCHEMA.TABLES AS T GROUP BY T.TABLE_SCHEMA UNION SELECT 'all_databases', CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) FROM INFORMATION_SCHEMA.TABLES AS T")
+      it "should call Mycmd::Client.#query" do
+        Mycmd::Client.should_receive(:query).with(sql).and_return(client)
       end
-    end
 
-    it "should output the size of all tables" do
-      conn_mock.should_receive(:query).with("SELECT T.TABLE_NAME, CAST(((T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) AS SIZE_MB FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = 'some_db' UNION SELECT 'all_tables', CAST((SUM(T.DATA_LENGTH+T.INDEX_LENGTH)/1024/1024) AS CHAR) FROM INFORMATION_SCHEMA.TABLES AS T WHERE T.TABLE_SCHEMA = 'some_db'")
-      Mycmd::StatusCommands.start(["size", "-d", "some_db"])
+      it "should call Mycmd::Client#print" do
+        client.should_receive(:print)
+        Mycmd::Client.stub(:query).and_return(client)
+      end
     end
   end
 

data/spec/mycmd/printer_spec.rb

@@ -5,23 +5,36 @@ describe Mycmd::Printer do
   let(:printer) {Mycmd::Printer.new(result)}
 
   describe "#initialize" do
-    it "should set specified result" do
-      expect(printer.result).to eq(result)
-    end
+    context "without header" do
+      let(:printer) {Mycmd::Printer.new(result)}
 
-    it "should set default header flug" do
-      expect(printer.header).to be_false
-    end
+      it "should set specified result" do
+        expect(printer.result).to eq(result)
+      end
 
-    it "should set specified header flug" do
-      printer = Mycmd::Printer.new(result, true)
-      expect(printer.header).to be_true
+      it "should set default header flug" do
+        expect(printer.header).to be_false
+      end
     end
 
-    it "should generate exception if not specified arguments" do
-      expect {
-        Mycmd::Printer.new
-      }.to raise_error
+    context "with header" do
+      let(:printer) {Mycmd::Printer.new(result, true)}
+
+      it "should set specified header flug" do
+        expect(printer.header).to be_true
+      end
+
+      it "should call Printer#result_to_array" do
+        result.should_receive(:is_a?).and_return(true)
+        Mycmd::Printer.any_instance.should_receive(:result_to_array).and_return(result)
+        printer
+      end
+
+      it "should call result#fields if header is true" do
+        result.should_receive(:is_a?).and_return(true)
+        result.should_receive(:fields)
+        printer
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -20,4 +20,4 @@ Dir[support_files].each {|f| require f}
 RSpec.configure do |config|
   config.order = "random"
   config.include(SpecUtils)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mycmd
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,6 +98,7 @@ files:
 - bin/mycmd
 - lib/mycmd.rb
 - lib/mycmd/cli.rb
+- lib/mycmd/client.rb
 - lib/mycmd/clis/config_commands.rb
 - lib/mycmd/clis/settings_commands.rb
 - lib/mycmd/clis/status_commands.rb
@@ -106,6 +107,7 @@ files:
 - lib/mycmd/version.rb
 - mycmd.gemspec
 - spec/mycmd/cli_spec.rb
+- spec/mycmd/client_spec.rb
 - spec/mycmd/clis/config_commands_spec.rb
 - spec/mycmd/clis/settings_commands_spec.rb
 - spec/mycmd/clis/status_commands_spec.rb
@@ -133,12 +135,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: MySQL command line tool
 test_files:
 - spec/mycmd/cli_spec.rb
+- spec/mycmd/client_spec.rb
 - spec/mycmd/clis/config_commands_spec.rb
 - spec/mycmd/clis/settings_commands_spec.rb
 - spec/mycmd/clis/status_commands_spec.rb