mrlic 0.1.2 → 0.1.5

data/Gemfile

@@ -8,6 +8,7 @@ group :development do
   gem "rcov", "0.9.11"
 end
 
-gem "colored"
-gem "mysql2"
+gem "colored","1.2"
+gem "mysql2","0.3.11"
+gem "activerecord","3.2.2"
 

data/Gemfile.lock

@@ -1,14 +1,29 @@
 GEM
   remote: http://ruby.taobao.org/
   specs:
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
     colored (1.2)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.3)
+    multi_json (1.3.6)
     mysql2 (0.3.11)
     rake (0.9.2.2)
     rcov (0.9.11)
@@ -19,15 +34,17 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (= 3.2.2)
   bundler (~> 1.1.3)
-  colored
+  colored (= 1.2)
   jeweler (~> 1.8.3)
-  mysql2
+  mysql2 (= 0.3.11)
   rcov (= 0.9.11)
   rdoc (~> 3.12)
   shoulda

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/lib/connect_db.rb

@@ -0,0 +1,44 @@
+#encoding: utf-8
+require File.expand_path("../env",__FILE__)
+
+#我经常在开发过程中需要链接数据库(在shell环境中)所有我想把这个功能给抽出来使用
+class Mysql 
+	attr_reader :db, 			#数据库名
+							:ip, 			#要链接数据库的ip
+							:user, 		#链接数据库的用户名
+							:password #链接数据库用户的密码
+	#初始化
+	def initialize *args
+	 @db = args[0] 
+	 @ip = args[1] || "127.0.0.1"
+	 @user = args[2] || "root"
+	 @password =  args[3] || ""
+	end
+
+	#链接数据库
+	def connect
+		 log_ok "ip=>#{@ip} 数据库=> #{@db} "
+		 ActiveRecord::Base.establish_connection({
+      :adapter  => "mysql2",
+      :database => @db,
+      :encoding => "utf8",
+      :port     => 3306,
+      :host     => @ip,
+      :username => @user,
+      :password => @password
+    	})
+		 # log_ok "当前链接的数据库是:#{@db}"
+	end
+
+	#输出当前链接数据库的信息
+	def current_db
+		log_ok "当前链接的数据库是:#{@db}"
+	end
+
+	#改变数据库
+	def change_db db
+		@db = db
+		connect
+	end
+
+end

data/lib/env.rb

@@ -0,0 +1,26 @@
+#encoding: utf-8
+require "colored"
+require "active_record"
+
+module Helper
+
+	#用于输出一般的日志信息
+	def	log_ok info
+		puts "==> #{info}".yellow
+	end
+
+	#用于输出错误的日志信息
+	def log_error info
+		puts "[error] #{info}".red
+	end
+
+	def help
+		log_ok = <<-EOF
+			以下是描述信息:
+			方法 'cdb' 用来链接数据库的参数依次是(数据库名,ip,数据库用户名,数据库对应用户名的密码)
+			方法 'dm' 用来定义一个类,这个类对应到数据库中的某一表参数分别为(model名,表名,主键)
+			首先要使用方法"cdb"链接到数据库,然后再操作其中的类
+		EOF
+	end
+
+end

data/lib/mrlic.rb

@@ -1,47 +1,20 @@
 #encoding: utf-8
-require File.expand_path("../tools/puts_helper",__FILE__)
-require "active_record"
-
-#我经常在开发过程中需要链接数据库(在shell环境中)所有我想把这个功能给抽出来使用
-class Mysql 
-	attr_reader :db,:ip,:user,:password
-	def initialize *args
-	 @db = args[0] 
-	 @ip = args[1] || "127.0.0.1"
-	 @user = args[2] || "root"
-	 @password =  args[3] || ""
-	end
-
-	def connect
-		 putsy "准备链接ip:#{@ip} | 访问数据库:#{@db}"
-		 ActiveRecord::Base.establish_connection(
-      :adapter  => "mysql2",
-      :database => @db,
-      :encoding => "utf8",
-      :port     => 3306,
-      :host     => @ip,
-      :username => @user,
-      :password => @password,
- 		)
-		putsy "ok! 当前数据库为:#{@db}"
-	end
-
-	def current_db
-		putsy "是的,当前数据库为:#{@db}"
-	end
+#! /usr/bin/ruby 
+require File.expand_path("../env",__FILE__)
+require File.expand_path("../connect_db",__FILE__)
 
-end
+include Helper
 
 # 定义一个model类,对应到数据库中的表
 def defind_model *args
 	class_name = args[0]
-	putsy "要操作的类是:#{class_name}"
+	log_ok "要操作的类是:#{class_name}"
 	
 	table = args[1] || "#{class_name}s"
-	putsy "要操作的数据库表是:#{table}"
+	log_ok "要操作的数据库表是:#{table}"
 	
 	primary_key = args[2]  || "id"
-	putsy "表:#{table} 的主键是:#{primary_key}"
+	log_ok "表:#{table} 的主键是:#{primary_key}"
 
 	eval <<-EOF
 		class #{class_name} < ActiveRecord::Base
@@ -54,16 +27,19 @@ alias :dm :defind_model
 
 # 操作入口 
 def cdb(*args)
-	putsy <<-EOF
-		以下是描述信息:
-		方法 'cdb' 用来链接数据库的参数依次是(数据库名,ip,数据库用户名,数据库对应用户名的密码)
-		方法 'dm' 用来定义一个类,这个类对应到数据库中的某一表参数分别为(model名,表名,主键)
-		首先要使用方法"cdb"链接到数据库,然后再操作其中的类
-	EOF
 	mysql = Mysql.new *args;
 	mysql.connect
+	puts "0k"
 end
 
+
+# cdb "shark3dev_world"
+# dm "Item","map_dbc","MapID"
+# puts Item.count
+
+
+
+
 # cdb "active_admin_study"
 # dm "AdminUser","admin_users"
 # puts AdminUser.first.attributes	

data/mrlic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mrlic"
-  s.version = "0.1.2"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["libo"]
-  s.date = "2012-05-26"
+  s.date = "2012-08-12"
   s.description = "longer description of your gem"
   s.email = "lb563@foxmail.com"
   s.executables = ["cdb.rb"]
@@ -26,8 +26,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/cdb.rb",
+    "lib/.DS_Store",
+    "lib/connect_db.rb",
+    "lib/env.rb",
     "lib/mrlic.rb",
-    "lib/tools/puts_helper.rb",
     "mrlic.gemspec",
     "test/helper.rb",
     "test/test_mrlic.rb"
@@ -42,16 +44,18 @@ 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<colored>, [">= 0"])
-      s.add_runtime_dependency(%q<mysql2>, [">= 0"])
+      s.add_runtime_dependency(%q<colored>, ["= 1.2"])
+      s.add_runtime_dependency(%q<mysql2>, ["= 0.3.11"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 3.2.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, ["= 0.9.11"])
     else
-      s.add_dependency(%q<colored>, [">= 0"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
+      s.add_dependency(%q<colored>, ["= 1.2"])
+      s.add_dependency(%q<mysql2>, ["= 0.3.11"])
+      s.add_dependency(%q<activerecord>, ["= 3.2.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.1.3"])
@@ -59,8 +63,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, ["= 0.9.11"])
     end
   else
-    s.add_dependency(%q<colored>, [">= 0"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
+    s.add_dependency(%q<colored>, ["= 1.2"])
+    s.add_dependency(%q<mysql2>, ["= 0.3.11"])
+    s.add_dependency(%q<activerecord>, ["= 3.2.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.1.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrlic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.11
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -140,8 +156,10 @@ files:
 - Rakefile
 - VERSION
 - bin/cdb.rb
+- lib/.DS_Store
+- lib/connect_db.rb
+- lib/env.rb
 - lib/mrlic.rb
-- lib/tools/puts_helper.rb
 - mrlic.gemspec
 - test/helper.rb
 - test/test_mrlic.rb
@@ -160,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3437743542075749286
+      hash: -597353956118653856
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tools/puts_helper.rb

@@ -1,5 +0,0 @@
-require "colored"
-
-def	putsy info
- puts "==> #{info}".yellow
-end