caramelize 0.0.1 → 0.0.2

data/lib/caramelize/cli/create_command.rb

@@ -30,9 +30,19 @@ module Caramelize::CLI
           
           # TODO create dummy config file
           
-        rescue
+          puts "Created new configuration file: caramelize.rb"
+          #puts args[0]
           require 'fileutils'
-          FileUtils.rm_rf(args[0])
+          
+          FileUtils.cp(File.dirname(__FILE__) +"/../caramel.rb", args[0])
+          
+          #File.open('caremelize.rb',"w+") do |f|
+          #  f << "query_data"
+          #end
+          
+        rescue
+          #require 'fileutils'
+          #FileUtils.rm_rf(args[0])
           raise
         end
         if commandparser.verbosity == :verbose

data/lib/caramelize/cli.rb

@@ -30,7 +30,7 @@ module Caramelize
         self.program_version = Caramelize::VERSION
         self.options = CmdParse::OptionParserWrapper.new do |opts|
           opts.separator "Global options:"
-          opts.on("--config DIR", "-d", String, "The config file (default: caramel.conf)") {|p| @directory = p}
+          opts.on("--config DIR", "-d", String, "The config file (default: caramel.rb)") {|p| @directory = p}
           opts.on("--verbose", "-v", "Print more output") { @verbosity = :verbose }
           opts.on("--quiet", "-q", "No output") { @verbosity = :quiet }
         end
@@ -46,24 +46,11 @@ module Caramelize
         possible_files.detect{|f| File.exists?(f)}
       end
       
-      # Utility method for sub-commands to create a default config file
-      def create_config
-        # TODO create dummy config
-        #if !defined?(@website)
-          #@config = Webgen::Website.new(@directory) do |config|
-          #  config['logger.mask'] = @log_filter
-          #end
-        #end
-        #@config
-      end
-
       # Utility method for sub-commands to transfer wiki contents
       def transfer_content
-        # TODO maybe move to mixin
         
         time_start = Time.now
         
-        # TODO outsource to config
         file = detect_configuration_file
         if file && File.exists?(file)
           instance_eval(File.read(file), file || '<eval>')

data/lib/caramelize/version.rb

@@ -1,3 +1,3 @@
 module Caramelize
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/caramelize/wiki.rb

@@ -4,10 +4,6 @@ module Caramelize
     include DatabaseConnector
     attr_accessor :revisions, :wiki_title, :titles, :description
     
-    #def initialize revisions
-    #  @revisions = revisions
-    #end
-    
     def initialize options={}
       @options = options
     end
@@ -26,8 +22,7 @@ module Caramelize
     end
     
     def convert_syntax?
-      # TODO
-      true
+      @options[:syntax] == :markdown
     end
     
     def latest_revisions

data/lib/caramelize/wikka2markdown_converter.rb

@@ -13,13 +13,12 @@ module Caramelize
       #str.gsub!(/(===)(.*?)(===)/) {|s| '`' + $2 + '`'}   #code
       str.gsub!(/(__)(.*?)(__)/) {|s| '<u>' + $2 + '</u>'}   #underline
       
-      str.gsub!(/(.*?)(\n\t-)(.*?)/) {|s| $1 + '\n' + $3 }   #list
+      #str.gsub!(/(.*?)(\n\t-)(.*?)/) {|s| $1 + '\n' + $3 }   #list
       
-      #str.gsub!(/(\t-)(.*?)/) {|s| '*' + $2 }   #list
+      str.gsub!(/(\t-)(.*?)/) {|s| '*' + $2 }   #list
       #str.gsub!(/(----)/) {|s| '~~~~'}   #seperator
       
       
-      
       # TODO more syntax conversion for links and images
       
       str

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caramelize
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2156137340 !ruby/object:Gem::Requirement
+  requirement: &2156383180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156137340
+  version_requirements: *2156383180
 - !ruby/object:Gem::Dependency
   name: cmdparse
-  requirement: &2156133960 !ruby/object:Gem::Requirement
+  requirement: &2156380360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156133960
+  version_requirements: *2156380360
 - !ruby/object:Gem::Dependency
   name: gollum
-  requirement: &2156131900 !ruby/object:Gem::Requirement
+  requirement: &2156379560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156131900
+  version_requirements: *2156379560
 description: By defining the access from the input to the output wiki you can migrate
   any wiki.
 email:
@@ -60,9 +60,9 @@ files:
 - README.md
 - Rakefile
 - bin/caramelize
-- caramel.rb
 - caramelize.gemspec
 - lib/caramelize/author.rb
+- lib/caramelize/caramel.rb
 - lib/caramelize/cli.rb
 - lib/caramelize/cli/create_command.rb
 - lib/caramelize/cli/run_command.rb