epubforge 0.0.10 → 0.0.11

data/lib/{action/thor_action.rb → epubforge/action/action.rb}

@@ -1,65 +1,80 @@
 module EpubForge
   module Action
     module SharedActionInterface
-      def actions_lookup
-        if self == ThorAction
-          @actions_lookup ||= ActionsLookup.new
-        else
-          ThorAction.actions_lookup
-        end
-      end
+      # def actions_lookup
+      #   if self == Action
+      #     @actions_lookup ||= ActionsLookup.new
+      #   else
+      #     Action.actions_lookup
+      #   end
+      # end
       
-      def register_action_subclass( klass )
-        if self == ThorAction
-          @subclasses ||= []
-          @subclasses = (@subclasses + [klass]).uniq
-        else
-          ThorAction.register_action_subclass( klass )
-        end
-      end
+      # def register_action_subclass( klass )
+      #   if self == Action
+      #     @subclasses ||= []
+      #     @subclasses = (@subclasses + [klass]).uniq
+      #   else
+      #     Action.register_action_subclass( klass )
+      #   end
+      # end
       
-      def subclasses
-        if self == ThorAction
-          @subclasses
-        else
-          ThorAction.subclasses
-        end
-      end
+      # def subclasses
+      #   if self == Action
+      #     @subclasses
+      #   else
+      #     Action.subclasses
+      #   end
+      # end
       
-      def command_to_action_classes
-        if self == ThorAction
-          @command_klass_lookup ||= {}
-        else
-          ThorAction.command_to_action_classes
-        end
-      end
+      # def command_to_action_classes
+      #   if self == Action
+      #     @command_klass_lookup ||= {}
+      #   else
+      #     Action.command_to_action_classes
+      #   end
+      # end
       
-      def description( str = nil )
-        @description = str if str
-        @description
-      end
+      get_and_set( :description )
+      # def description( str = nil )
+      #   @description = str if str
+      #   @description
+      # end
       
       # eventually replace description
       def desc( usage, description, options = {} )
+        verbose = defined?(EpubForge::Action::Character)  && self == EpubForge::Action::Character
+        puts "--------------IN DESC()----------------"   if verbose
+        puts self.method_options.inspect                 if verbose
         self.command_to_action_classes[usage] = self
         super( usage, description, options )
+        puts self.method_options.inspect                 if verbose
+        puts "--------------END DESC()----------------"  if verbose
       end
 
-      # TODO: Get rid of this
-      def keywords( *args )
-        if args.epf_blank?
-          @keywords ||= []
-        else 
-          @keywords = args.map(&:to_s)
-        end
-        
-        @keywords
-      end
+      # # TODO: Get rid of this
+      # def keywords( *args )
+      #   if args.fwf_blank?
+      #     @keywords ||= []
+      #   else 
+      #     @keywords = args.map(&:to_s)
+      #   end
+      #   
+      #   @keywords
+      # end
       
-      def usage( str = nil )
-        @usage = str if str
-        @usage
-      end
+      # If given one arg, sets keyword
+      # if given no args, fetches keyword
+      get_and_set( :keyword, :usage )      # 
+            # def keyword( k = nil )
+            #   @keyword = k unless k.nil?
+            #   @keyword
+            # end
+            # 
+            # 
+            # def usage( str = nil )
+            #   @usage = str if str
+            #   @usage
+            # end
       
       def project_required?
         @project_required = true if @project_required.nil?
@@ -83,11 +98,11 @@ module EpubForge
       end
     end
     
-    class ThorAction < Thor
-      def self.inherited( subclass )
-        self.register_action_subclass( subclass )
-        subclass.include_standard_options
-      end
+    class Action < Thor
+      # def self.inherited( subclass )
+      #   self.register_action_subclass( subclass )
+      #   subclass.include_standard_options
+      # end
       
       include Thor::Actions
       extend SharedActionInterface
@@ -102,6 +117,9 @@ module EpubForge
       ON_BLUE   = Thor::Shell::Color::ON_BLUE
       
       
+      
+      
+      
       protected      
       def say_when_verbose( *args )
         say( *args ) if @verbose
@@ -142,9 +160,9 @@ module EpubForge
         end
         
         choice_text = ""
-        choices.each_with_index{ |choice,i|
+        choices.each_with_index do |choice,i|
           choice_text << "\t\t#{i}) #{choice.first}\n" 
-        }
+        end
         
         selection = ask( "#{statement}\n\tChoices:\n#{choice_text}>>> ", BLUE )
         choices[selection.to_i].last
@@ -153,6 +171,8 @@ module EpubForge
       def ask_prettily( statement )
         ask( statement, BLUE )
       end
+
+
       
       # hope this doesn't break anything.  Sure enough, it broke a lot of things.
       # def destination_root=( root )
@@ -160,16 +180,6 @@ module EpubForge
       #   @destination_stack << (root ? root.fwf_filepath.expand : '')
       # end
 
-      # Instead, use these instead of destination_root.  Thor gets strings instead of
-      # filepaths, like it wants, and I get filepaths instead of strings, like I want.
-      def destination_root_filepath
-        self.destination_root.fwf_filepath
-      end
-
-      def destination_root_filepath=(root)
-        self.destination_root = root.to_s
-      end
-      
       def executable_installed?( name )
         name = name.to_sym
         
@@ -218,7 +228,7 @@ module EpubForge
       end
       
       def project_already_gitted?
-        @project.target_dir.join( ".git" ).directory?
+        @project.root_dir.join( ".git" ).directory?
       end
       
       def quit_with_error( msg, errno = -1 )
@@ -227,12 +237,22 @@ module EpubForge
       end
       
       def before_start
-        @project = @options[:project]
-        @debug   = @options[:debug]
-        @help    = @options[:help]
-        @verbose = @options[:verbose]
+        variablize_options( :project, :debug, :help, :verbose )
+                # @project = @options[:project]
+                # @debug   = @options[:debug]
+                # @help    = @options[:help]
+                # @verbose = @options[:verbose]
         @project = Project.new( @project ) unless @project.nil?
       end
+      
+      # takes a series of symbols or an array of symbols
+      # for each symbol, creates an instance var from @options[:symbol]
+      def variablize_options( *symbols )
+        symbols.flatten!  # in case someone passes an array
+        for sym in symbols
+          self.instance_variable_set( :"@#{sym}", @options[sym] )
+        end
+      end
     end
   end
 end

data/lib/epubforge/action/action2.rb

@@ -0,0 +1,109 @@
+module EpubForge
+  module Action
+    class Action2
+      get_and_set( :project, :args )
+      get_and_set_boolean( :verbose )
+      
+      include FunWith::Patterns::Loader
+      loader_pattern_configure( :bracketwise_lookup, 
+                                :warn_on_key_change, 
+                                { :verbose => true } )
+      
+      
+      
+      include Chatterbox
+      
+      def self.loader_pattern_load_item( file )
+        begin
+          file.fwf_filepath.load
+        rescue Exception => e
+          puts "Error loading #{file}: #{e.message}"
+          for line in e.backtrace
+            puts "\t#{line}"
+          end
+        end
+        
+        nil    # returning true will break loader
+      end
+      
+      def self.define_action( keyword, &block )
+        puts "defining action #{keyword}" if EpubForge.gem_test_mode?
+        definition = ActionDefinition.new
+        definition.keyword( keyword )
+        definition.klass( self )
+        
+        yield definition if block_given?
+        
+        EpubForge::Action::Action2.loader_pattern_register_item( definition )
+      end
+      
+      # # Instead, use these instead of destination_root.  Thor gets strings instead of
+      # # filepaths, like it wants, and I get filepaths instead of strings, like I want.
+      # def destination_root_filepath
+      #   self.destination_root.fwf_filepath
+      # end
+      # 
+      # def destination_root_filepath=(root)
+      #   @destination_root_file
+      #   self.destination_root = root.to_s
+      # end
+      attr_accessor :destination_root_filepath
+      
+      def executable_installed?( name )
+        name = name.to_sym
+        
+        if @executables.nil?
+          @executables = {}
+          for exe, path in (EpubForge.config[:exe_paths] || {})
+            @executables[exe] = path.fwf_filepath
+          end
+        end
+        
+        @executables[name] ||= begin
+          _which = `which #{name}`.strip
+          (_which.length == 0) ? false : _which.fwf_filepath
+        end
+          
+        @executables[name]  
+      end
+      
+      def requirements
+        @requirements ||= []
+      end
+      
+      def add_requirement( *args, &block )
+        @requirements ||= []
+        @requirements.push( [args, block] )
+      end
+      
+      def requires_executable( ex, fail_msg )
+        add_requirement( ex, fail_msg ) do
+          executable_installed?( ex, fail_msg )
+        end
+      end
+      
+      def must_target_a_project( project_dir )
+        add_requirement( project_dir ) do
+          Project.is_project_dir?( project_dir )
+        end
+      end
+      
+      def git_installed?
+        executable_installed?('git')
+      end
+      
+      def ebook_convert_installed?
+        executable_installed?('ebook-convert')
+      end
+      
+      def project_already_gitted?
+        @project.root_dir.join( ".git" ).directory?
+      end
+      
+      def quit_with_error( msg, errno = -1 )
+        STDERR.write( "\n#{msg}\n")
+        exit( errno )
+      end
+    end
+  end
+end

data/lib/epubforge/action/action_definition.rb

@@ -0,0 +1,62 @@
+module EpubForge
+  module Action
+    class ActionDefinition
+      # attr_accessor  :default_args, :keyword, :klass, :proc
+
+      get_and_set :help, :usage, :default_args, :keyword, :klass, :proc
+      get_and_set_boolean :project_required, :verbose
+      
+      alias :loader_pattern_registry_key :keyword
+      
+      def execute( &block )
+        proc( block )
+      end
+      
+      def run( *args )
+        action = klass.new    # one of the action classes (New or Git or Epub, etc.)
+        puts( "Sending args to Action(#{self.keyword}) : #{ 'NO ARGS' if args.fwf_blank? }".paint(:pink) ) if EpubForge.gem_test_mode?
+        for arg, i in args.each_with_index
+          puts "    #{i}: #{arg.inspect}".paint(:pink) if verbose?
+        end
+        
+        if args.first.is_a?(Project)
+          action.project( args.first )
+          action.args( args[1..-1] )
+        else
+          action.args( args )
+        end
+        
+        action.instance_exec( &@proc )
+      end
+      
+      
+      def default( name, value )
+        (@default_args ||= {})[name] = value
+      end
+
+      # def project_required?
+      #   @project_required = true if @project_required.nil?
+      #   @project_required
+      # end
+      
+      # def verbose?
+      #   @verbose == true
+      # end
+      
+      # Most actions require -- nay, demand! -- a project to act upon.
+      # Add the line 'project_not_required' to the class definition
+      # to keep it from failing out if it can't find an existing project.
+      # Used for things like initializing new projects, printing help, 
+      # or... my imagination fails me.
+      def project_required?
+        @project_required = true if @project_required.nil?
+        @project_required
+      end
+      
+      
+      def project_not_required
+        @project_required = false
+      end
+    end
+  end
+end

data/lib/epubforge/action/actions_lookup.rb

@@ -0,0 +1,45 @@
+# module EpubForge
+#   module Action
+#     class ActionsLookup
+#       attr_accessor :actions, :actions_directories, :keywords
+# 
+#       def initialize
+#         clear
+#       end
+# 
+#       def clear
+#         @keywords = {}
+#         @actions = []
+#         @actions_directories = [] 
+#       end
+#       
+#       def add_actions( *args )
+#         Utils::ActionLoader.load_me( *args )
+# 
+#         new_actions = Utils::ActionLoader.loaded_classes - @actions
+#         @actions += new_actions
+#         new_directories = Utils::ActionLoader.loaded_directories - @actions_directories
+#         @actions_directories += new_directories
+# 
+#         for action in new_actions
+#           for keyword in action.keywords
+#             @keywords[keyword] = action
+#           end
+#         end
+#       end
+# 
+#       # Find all the actions with keywords that start with the given string.
+#       # If this results in more than one action being found, the proper
+#       # response is to panic and flail arms.
+#       def keyword_to_action( keyword )
+#         exact_match = @keywords.keys.select{ |k| k == keyword }
+# 
+#         return [@keywords[exact_match.first]] if exact_match.length == 1
+# 
+#         # if no exact match can be found, find a partial match, at the beginning
+#         # of the keywords.
+#         @keywords.keys.select{ |k| k.match(/^#{keyword}/) }.map{ |k| @keywords[k] }.uniq
+#       end
+#     end
+#   end
+# end

data/lib/epubforge/action/chatterbox.rb

@@ -0,0 +1,93 @@
+module EpubForge
+  module Action
+    module Chatterbox
+      def say( message, color = nil )
+        puts message.paint(color)
+      end
+      
+      def ask( question, opts = {} )
+        while true
+          opts[:colors] ||= opts[:color]
+          
+          answer = nil
+          input = Readline.readline( question.paint(opts[:colors] ) + " " ).strip
+          input.strip
+          
+          if input.fwf_blank?
+            if opts[:default]
+              answer = opts[:default]
+            elsif opts[:blank_allowed] || (opts[:possible_answers] || []).include?("")
+              answer = input
+            end
+          elsif opts[:possible_answers]
+            answer = input if opts[:possible_answers].include?( input )
+          else
+            answer = input
+          end
+          
+          if answer.nil?
+            say( "'#{input}' is not a valid answer.", :red )
+            say( "Possible answers: #{ opts[:possible_answers].inspect }") if opts[:possible_answers]
+          end
+          
+          return answer unless answer.nil?
+        end
+      end
+      
+      def yes?( message, opts = {} )
+        opts[:colors]   ||= :blue
+        opts[:possible_answers] = ["Y", "y", "N", "n", "yes", "no"]
+        opts[:default] ||= "y"
+        
+        answer = ask( "#{message} (Y/n)", opts ).downcase[0..1]
+        
+        answer == "y"
+      end
+      
+      def yes_prettily?( statement )
+        yes?( statement, :color => :pink )
+      end
+      
+      
+      def no?( message, color = nil )
+        opts[:allowed] = ["Y", "y", "N", "n"]
+        opts[:default] = "n"
+        answer = ask( "#{message} (y/N)", opts ).downcase
+        
+        answer == "n"
+      end
+      
+      def say_instruction( instruction )
+        puts instruction.paint(:yellow)
+      end
+      
+
+      def ask_from_menu( statement, choices )
+        choices.map! do |choice|
+          choice.is_a?(String) ? [choice] : choice    # I'm being too clever by half here.  .first/.last still works.
+        end
+        
+        choice_text = ""
+        choices.each_with_index do |choice,i|
+          choice_text << "\t\t#{i}) #{choice.first}\n" 
+        end
+        
+        selection = ask( "#{statement}\n\tChoices:\n#{choice_text}>>> ".paint(:blue) )
+        choices[selection.to_i].last
+      end
+      
+      def ask_prettily( question, *args )
+        ask( question.paint(:blue), *args  )
+      end
+      
+      def say_all_is_well( statement )
+        say( statement, :green )
+      end
+      
+      def say_error( statement )
+        say( statement.paint(:bg_red, :bold) )
+      end
+      
+    end
+  end
+end