lib/slideshow.rb in slideshow-1.2.5 vs lib/slideshow.rb in slideshow-2.0.0

- old
+ new

@@ -48,11 +48,10 @@ require 'slideshow/manifest_helpers' require 'slideshow/plugin_helpers' require 'slideshow/slide' require 'slideshow/cli/opts' -require 'slideshow/cli/runner' require 'slideshow/cli/commands/fetch' require 'slideshow/cli/commands/gen' require 'slideshow/cli/commands/gen_templates' require 'slideshow/cli/commands/list' require 'slideshow/cli/commands/plugins' @@ -92,11 +91,11 @@ def self.generator "Slide Show (S9) #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" end - def self.main + def self.main_old # allow env variable to set RUBYOPT-style default command line options # e.g. -o slides -t <your_template_manifest_here> slideshowopt = Env.slideshowopt @@ -104,9 +103,15 @@ args += slideshowopt.split if slideshowopt args += ARGV.dup Runner.new.run(args) end + + def self.main + require 'slideshow/cli/main' + ## Runner.new.run(ARGV) - old code + end + end # module Slideshow # load built-in (optional) helpers/plugins/engines # If a helper fails to load, simply ingnore it \ No newline at end of file