cmdr 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/cmdr.rb +12 -9
  2. metadata +1 -1
@@ -11,22 +11,25 @@ class Cmdr
11
11
 
12
12
  def initialize(main_opt={}, app_mgr=nil)
13
13
  opt = {
14
- public: {alias: {},
15
- user:
16
- {'-1' =>
17
- {
18
- history:
19
- {list: [], index: []}
14
+ public: {
15
+ alias: {},
16
+ user:
17
+ {'-1' =>
18
+ {
19
+ history:
20
+ {list: [], index: []}
21
+ }
20
22
  }
21
- }
22
23
  },
23
24
  config: {bottom_up_display: true}
24
- }.merge(main_opt)
25
+ }
26
+ opt.merge!(main_opt[:public]) unless main_opt[:public].empty?
27
+ opt.merge!(main_opt[:config]) unless main_opt[:config].empty?
25
28
 
26
29
  @v = opt[:public]
27
30
  @bottom_up_display = opt[:config][:bottom_up_display]
28
31
  @@app = app_mgr
29
- @content_type = 'text/xml'
32
+
30
33
  super()
31
34
  end
32
35
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cmdr
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors: []
7
7