xiki 0.6.3 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.markdown +3 -1
- data/lib/xiki/menu.rb +5 -4
- data/menu/mysql.rb +4 -3
- data/xiki.gemspec +2 -2
- metadata +2 -2
data/README.markdown
CHANGED
|
@@ -14,7 +14,7 @@ Either install as a gem, or install from github.
|
|
|
14
14
|
|
|
15
15
|
## Or, from github
|
|
16
16
|
|
|
17
|
-
$ git clone git
|
|
17
|
+
$ git clone git://github.com/trogdoro/xiki.git
|
|
18
18
|
$ cd xiki
|
|
19
19
|
$ sudo gem install bundler
|
|
20
20
|
$ sudo bundle install --system
|
|
@@ -82,6 +82,8 @@ don't know it, run this command:
|
|
|
82
82
|
|
|
83
83
|
$ xiki directory
|
|
84
84
|
|
|
85
|
+
Then quit emacs and open it again.
|
|
86
|
+
|
|
85
87
|
### If you get an error
|
|
86
88
|
|
|
87
89
|
If you got partially through the load...
|
data/lib/xiki/menu.rb
CHANGED
|
@@ -354,6 +354,9 @@ class Menu
|
|
|
354
354
|
"- defined!"
|
|
355
355
|
end
|
|
356
356
|
|
|
357
|
+
#
|
|
358
|
+
# Menu.split("aa/|b/b/|c/c")
|
|
359
|
+
#
|
|
357
360
|
def self.split path, options={}
|
|
358
361
|
path = path.sub /\/$/, ''
|
|
359
362
|
path = Tree.rootless path if options[:rootless]
|
|
@@ -576,10 +579,8 @@ Ol << "location: #{location.inspect}"
|
|
|
576
579
|
return if orig == View.line
|
|
577
580
|
|
|
578
581
|
# If it inserted something
|
|
579
|
-
|
|
580
582
|
output = Tree.siblings :everything=>1
|
|
581
|
-
|
|
582
|
-
# return
|
|
583
|
+
# output = Tree.siblings :cross_blank_lines=>1, :everything=>1
|
|
583
584
|
|
|
584
585
|
# Shouldn't this be looping like self.collapser_launcher ?
|
|
585
586
|
Tree.to_parent
|
|
@@ -634,7 +635,7 @@ Ol << "location: #{location.inspect}"
|
|
|
634
635
|
elsif line =~ /^[ +-]*@/ && Tree.has_child? # If on ^@... line and there's child on next line...
|
|
635
636
|
# Will grab the whole tree and move it up
|
|
636
637
|
Tree.subtree.unindent.sub(/^[ @+-]+/, '')
|
|
637
|
-
|
|
638
|
+
else
|
|
638
639
|
do_launch = true
|
|
639
640
|
Tree.path.last
|
|
640
641
|
end
|
data/menu/mysql.rb
CHANGED
|
@@ -232,7 +232,7 @@ class Mysql
|
|
|
232
232
|
end
|
|
233
233
|
|
|
234
234
|
def self.select statement, row=nil
|
|
235
|
-
table = statement[/from (.+?)( |$)
|
|
235
|
+
table = statement[/from (.+?)( |$)/i, 1]
|
|
236
236
|
|
|
237
237
|
# If just statement, run it
|
|
238
238
|
|
|
@@ -253,7 +253,7 @@ end
|
|
|
253
253
|
|
|
254
254
|
Keys.enter_list_mysql { Launcher.insert('- Mysql.dbs/') }
|
|
255
255
|
|
|
256
|
-
Launcher.add /^select \* from($|\/)/ do |path|
|
|
256
|
+
Launcher.add /^select \* from($|\/)/i do |path|
|
|
257
257
|
if path !~ /\// # If just "select * from", show all tables
|
|
258
258
|
next Tree.<< Mysql.run(@default_db, 'show tables'), :no_slash=>1
|
|
259
259
|
end
|
|
@@ -264,10 +264,11 @@ Launcher.add /^select \* from($|\/)/ do |path|
|
|
|
264
264
|
Deletes.backward
|
|
265
265
|
Deletes.backward
|
|
266
266
|
Move.to_end
|
|
267
|
+
Launcher.launch
|
|
267
268
|
|
|
268
269
|
end
|
|
269
270
|
|
|
270
|
-
Launcher.add(/^select /) do |path|
|
|
271
|
+
Launcher.add(/^select /i) do |path|
|
|
271
272
|
args = Menu.split(path)
|
|
272
273
|
Tree.<< Mysql.select(*args), :no_slash=>(args.length > 1)
|
|
273
274
|
end
|
data/xiki.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = "xiki"
|
|
8
|
-
s.version = "0.6.
|
|
8
|
+
s.version = "0.6.4"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Craig Muth"]
|
|
12
|
-
s.date = "2012-
|
|
12
|
+
s.date = "2012-09-22"
|
|
13
13
|
s.executables = ["xiki"]
|
|
14
14
|
s.summary = "A shell console with GUI features."
|
|
15
15
|
s.description = "Xiki does what shell consoles do, but lets you edit everything at any time. It's trivial to make your own commands and menus to access other tools."
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: xiki
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.4
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-
|
|
12
|
+
date: 2012-09-22 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: sourcify
|