Commits

Richo Healey  committed 347f247 Merge with conflicts

Merge branch 'master' into newsfeed

Conflicts:
lib/twat/argparse.rb

  • Participants
  • Parent commits 7e35563, 6455a2f

Comments (0)

Files changed (1)

File lib/twat/argparse.rb

         options[:action] = :tweet
         options[:account] = :default
         opts.banner = "Usage: twat <tweet>"
-        opts.on('-n', '--account ACCOUNT', 'Use ACCOUNT (or default)') do |acct|
+
+        opts.on('-n', '--account ACCOUNT', 'Use ACCOUNT (or default)') do |acct| #{{{ --account ACCOUNT
           options[:account] = acct.to_sym
-        end
-        opts.on('-a', '--add ACCOUNT', 'Configure and authorise ACCOUNT') do |acct|
+        end # }}}
+        opts.on('-a', '--add ACCOUNT', 'Configure and authorise ACCOUNT') do |acct| #{{{ --add ACCOUNT
           options[:account] = acct.to_sym
           options[:action] = :add
-        end
-        opts.on('-d', '--delete ACCOUNT', 'Delete ACCOUNT') do |acct|
+        end #}}}
+        opts.on('-d', '--delete ACCOUNT', 'Delete ACCOUNT') do |acct| #{{{ --delete ACCOUNT
           options[:account] = acct.to_sym
           options[:action] = :delete
-        end
-        #opts.on( '-a' '--add ACCOUNT' ) do |acct|
-        #end
-        opts.on('-h', '--help', 'Display this screen') do
+        end #}}}
+        opts.on('-h', '--help', 'Display this screen') do #{{{ --help
           puts opts
           exit
-        end
+        end #}}}
         opts.on('-l', '--list [COUNT]', 'Display [count] tweets from your newsfeed') do |count|
           options[:count] = count || 10
           options[:action] = :show
         end
-        opts.on('-v', '--version', 'Display version info') do
+        opts.on('-v', '--version', 'Display version info') do #{{{ --version
           options[:action] = :version
-        end
+        end #}}}
       end
+
       @optparser.parse!
       REQUIRED.each do |req|
         usage unless options[req]