diff options
| author | Neil Lathwood <neil@lathwood.co.uk> | 2018-04-27 11:38:06 +0100 |
|---|---|---|
| committer | Neil Lathwood <neil@lathwood.co.uk> | 2018-04-27 11:38:06 +0100 |
| commit | b1194745929043b578c409f794ecb433aa515fa9 (patch) | |
| tree | 133e7103073b707aaca855eb3df4d5025bebae06 /lib/oxidized/string.rb | |
| parent | 9156243b9debfc0bc2b05dfe98a910ce5153bf49 (diff) | |
| parent | 34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff) | |
Rebased and fixed conflicts
Diffstat (limited to 'lib/oxidized/string.rb')
| -rw-r--r-- | lib/oxidized/string.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/oxidized/string.rb b/lib/oxidized/string.rb index 8bcb082..ca4862d 100644 --- a/lib/oxidized/string.rb +++ b/lib/oxidized/string.rb @@ -15,11 +15,11 @@ module Oxidized # sets @cmd and @name unless @name is already set def set_cmd command - @cmd = command + @cmd = command @name ||= @cmd.strip.gsub(/\s+/, '_') end - def initialize str='' + def initialize str = '' super if str.class == Oxidized::String @cmd = str.cmd @@ -27,6 +27,5 @@ module Oxidized @type = str.type end end - end end |