rmthemegen 0.0.22 → 0.0.23

data/lib/rmthemegen/geany_fix.rb

@@ -21,8 +21,8 @@ module RMThemeGen
     puts "  Restart geany to see new colors  "
   
     begin
-    @dir = (File.expand_path "~/.config/geany/filedefs/")+"/"
-    @filelist = Dir.glob(@dir+"filetypes.*")
+    @dir = (File.expand_path "~/.config/geany/filedefs/")
+    @filelist = Dir.glob(@dir+"/filetypes.*")
 #  puts @dir+"filetypes.*"
 #    puts @filelist.inspect
     t =Time.now
@@ -138,17 +138,34 @@ module RMThemeGen
       @filelist.each do |f|
         begin
 #          puts f+" -->"+@dir+"_old_"+@extstring+File.basename(f)
-          IO.copy_stream(f,@dir+"_old_"+@extstring+File.basename(f))
-          
-     ##   rescue
-      #    raise "sorry there was a problem backing up the following file: "+f
+#          IO.copy_stream(f,@dir+"_old_"+@extstring+File.basename(f))
+        copystring="cp #{f} #{@dir+"/_old_"+@extstring+File.basename(f)}"
+#        puts(copystring) 
+        `#{copystring}`
+        rescue
+          backup_problem = true
+          raise "sorry there was a problem backing up the following file: "+f
         end
       end
 
+      ##########################################
+      # copy in our new files from token_list.rb
+      ##########################################
+      @@geany_file_contents.each_key do |key|
+      filename=@dir+'/filetypes.'+key.to_s
+#      puts filename
+      @fout1 = File.open(filename,"w+")
+        @@geany_file_contents[key].each do |c|
+          @fout1.puts c
+        end
+      @fout1.close
+      end 
+
+      @filelist = Dir.glob(@dir+"/filetypes.*")
       @filelist.each do |f|
   #      puts f.inspect
         @fin = File.open(f,"r+")
-        @fout = File.open("/tmp/gean"+Time.new().nsec.to_s,"w+")
+        @fout = File.open(@dir+"/tmp_out_"+rand.to_s,"w+")
   #      puts @fin.inspect
 
         while !@fin.eof? do
@@ -185,6 +202,10 @@ module RMThemeGen
                   rb = randcolor(:bg_rgb=>@backgroundcolor, :min_cont=>@min_cont, :max_cont=>1.0).upcase
                   rf = randcolor(:bg_rgb=>rb, :min_cont=>0.30, :max_cont=>1.0).upcase
                   newl = token +"="+"0x"+rf+";0x"+rb+";"+"true"+";"+"false"
+                elsif token.include?("type") then 
+                  newl ="type=0xffffff;;true;false"
+                elsif token.include?("indent_guide") then
+                  newl= "indent_guide=0xc0c0c0;;false;false"
                 else
                   newl = token +"="+"0x"+r1+";0x"+r2+";"+p3+";"+p4
                 end
@@ -204,9 +225,9 @@ module RMThemeGen
                 else
                   newl = token +"="+"0x"+r1+";0x"+r2+";"+p3+";"+p4
                 end
-              else
+              else  ############ DEFAULT  ############ 
                 if token.include?("comment") then
-                  r1 = randcolor(:bg_rgb=>@backgroundcolor, :min_cont=>@min_cont*0.33, :max_cont=>@min_cont*0.64).upcase
+                  r1 = randcolor(:bg_rgb=>@backgroundcolor, :min_cont=>@min_cont*0.77, :max_cont=>@min_cont*0.95).upcase
                   r2 = @backgroundcolor.upcase
                   newl = token +"="+"0x"+r1+";0x"+r2+";"+p3+";"+p4
                 else
@@ -214,17 +235,16 @@ module RMThemeGen
                 end
             end
             @fout.puts(newl)
- #           puts newl
-  #r2= randcolor(:back_rgb=>@backgroundcolor, :min_cont=>@min_cont, :max_cont=>@max_cont)
-  #newl = line.sub(/\=0x*\;/,"=0x"+r1+";")
           else
             @fout.puts(line)
           end
         end
         if @fout then
-          File.delete(File.absolute_path @fin)
-          File.rename(File.absolute_path(@fout), @dir+File.basename(f) )
-        else puts "there was a problem writing to the new file so I left the old one in place"
+#        puts "wanting to delete "+@fin.path.to_s
+#        puts "wanting to copy this file onto it:"+@fout.path.to_s
+          File.delete(@fin.path.to_s)
+          File.rename(@fout.path.to_s, @fin.path.to_s )
+        else puts "there was a problem writing to the new file #{@fout.path.to_s} so I left the old one in place"
         end
         @fout.close
       end