rmthemegen 0.0.39 → 0.0.40

data/bin/{geany_fix.rb → geany_fix}

@@ -21,8 +21,6 @@
 require File.expand_path("../../lib/rmthemegen/token_list",__FILE__)
 require File.expand_path('../../lib/rmthemegen/color/color',__FILE__)
 require File.expand_path("../../lib/rmthemegen/xmlsimple.rb",__FILE__)
-#require File.dirname(__FILE__)#+'./lib/rmthemegen/color/color'
-#require File.dirname(__FILE__)#+'./lib/rmthemegen/xmlsimple.rb'
 
 module RMThemeGen
   class GeanyFixer < RMThemeParent
@@ -30,7 +28,6 @@ module RMThemeGen
     attr_reader :xmlout #a huge structure of xml that can be given to XmlSimple.xml_out() to create that actual color theme file
 
     def initialize
-#    @rand = Random.new
     @iterations = 0
     @iterations = ARGV[0].to_s.to_i
 
@@ -43,19 +40,14 @@ module RMThemeGen
     begin
     @dir = (File.expand_path "~/.config/geany/filedefs/")
     @filelist = Dir.glob(@dir+"/filetypes.*")
-#  puts @dir+"filetypes.*"
-#    puts @filelist.inspect
-    t =Time.now
-    @extstring = t.year.to_s+t.month.to_s+t.day.to_s+t.sec.to_s
-#    rescue
- #     raise "Sorry. There was trouble accessing the files in " + @dir
+    @extstring = Time.now.strftime("%Y-%m-%d-%M.%S") 
     end
 
 
       @italic_candidates = ["STRING", "SYMBOL", "REQUIRE"]
 
       @bold_candidates = ["KEYWORD","RUBY_SPECIFIC_CALL", "CONSTANT", "COMMA", "PAREN","RUBY_ATTR_ACCESSOR_CALL", "RUBY_ATTR_READER_CALL" ,"RUBY_ATTR_WRITER_CALL", "IDENTIFIER"]
-# with code inspections we don't color the text, we just put a line or something under it .
+      # with code inspections we don't color the text, we just put a line or something under it .
       @code_inspections = ["ERROR","WARNING_ATTRIBUTES","DEPRECATED", "TYPO","WARNING_ATTRIBUTES", "BAD_CHARACTER",
       "CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES","ERRORS_ATTRIBUTES", "MATCHED_BRACE_ATTRIBUTES"]
       @cross_out = ["DEPRECATED_ATTRIBUTES" ]
@@ -66,11 +58,11 @@ module RMThemeGen
       @bold_chance = 0.4
       @underline_chance = 0.3
       @bright_median = 0.85
-        @min_bright = @bright_median * 0.65
-        @max_bright =  [@bright_median * 1.35,1.0].max
+      @min_bright = @bright_median * 0.65
+      @max_bright =  [@bright_median * 1.35,1.0].max
 
-        @min_bright = 0.0
-        @max_bright =  1.0
+      @min_bright = 0.0
+      @max_bright =  1.0
 
       #	if we avoid any notion of "brightness", which is an absolute quality, then we
       # can make our background any color we want !
@@ -83,22 +75,16 @@ module RMThemeGen
       #broad contrast spec
       @min_cont = 0.32
       @max_cont = 1.0
-
       @schemeversion = 1
       @background_max_brightness = 0.16
       @background_grey = true #if false, allows background to be any color, as long as it meets brightness parameter
-    #  @foreground_min_brightness = 0.4
-
-
       @backgroundcolor= randcolor( :shade_of_grey=>@background_grey, :max_bright=>@background_max_brightness)# "0"
-
     end #initialize
 
     def randthemename
       out = " "
       while out.include? " "   do
        out = @@adjectives[rand * @@adjectives.size]+"_"+@@nouns[rand * @@nouns.size]
-        
       end
       return out
     end
@@ -137,13 +123,8 @@ module RMThemeGen
         b = (df[:b] || rand*256)%256
         g = b = r if df[:shade_of_grey] == true
         color = Color::RGB.new(r,g,b)
-  #puts "bg" + @backgroundcolor if df[:bg_rgb]
-  #puts "color "+color.html
-  #puts "contrast "+color.contrast(df[:bg_rgb]).to_s if df[:bg_rgb]
         contok = df[:bg_rgb] ? (df[:min_cont]..df[:max_cont]).include?( color.contrast(df[:bg_rgb]) ) : true
-  #puts "contok "+contok.to_s
         brightok = (df[:min_bright]..df[:max_bright]).include?( color.to_hsl.brightness )
-  #puts "brightok "+brightok.to_s
       end
 
       cn = color.html
@@ -154,13 +135,11 @@ module RMThemeGen
     def go_fix_geany
       #goes into the geany directory and kicks some ass. it replaces every single color definition with
       #something random, of course with a consistent background. 
-
+      @backup_dir = @dir+'/_backup_'+@extstring
+      `mkdir #{@backup_dir}`
       @filelist.each do |f|
         begin
-#          puts f+" -->"+@dir+"_old_"+@extstring+File.basename(f)
-#          IO.copy_stream(f,@dir+"_old_"+@extstring+File.basename(f))
-        copystring="cp #{f} #{@dir+"/_old_"+@extstring+File.basename(f)}"
-#        puts(copystring) 
+        copystring="cp #{f} #{@backup_dir}"
         `#{copystring}`
         rescue
           backup_problem = true
@@ -173,7 +152,6 @@ module RMThemeGen
       ##########################################
       @@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
@@ -183,18 +161,14 @@ module RMThemeGen
 
       @filelist = Dir.glob(@dir+"/filetypes.*")
       @filelist.each do |f|
-  #      puts f.inspect
         @fin = File.open(f,"r+")
         @fout = File.open(@dir+"/tmp_out_"+rand.to_s,"w+")
-  #      puts @fin.inspect
 
         while !@fin.eof? do
           curpos = @fin.pos
           line  = @fin.readline
           if line[0] != "#" && line.include?("=") && line.include?("0x") then
            # go in and root out the color and give it a new one.
-#            puts "here is the line I'm working on -- "
-#            puts line
             r1 = randcolor(:bg_rgb=>@backgroundcolor, :min_cont=>@min_cont, :max_cont=>@max_cont).upcase
             r2 = @backgroundcolor.upcase
             token = line.split("=")[0]
@@ -260,8 +234,6 @@ module RMThemeGen
           end
         end
         if @fout then
-#        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"

data/lib/rmthemegen/token_list.rb

@@ -2215,11 +2215,11 @@ singlestring=0x66ff00;0x000000;false;false
 attribute=0x99cc99;0x000000;false;false
 value=0xffffff;0x000000;false;false
 id=0x339999;0x000000;true;false
-#identifier2=0x996699;0x000000;true;false # not in np++
+identifier2=0x996699;0x000000;true;false # not in np++
 identifier2=0x999966;0x000000;true;false
 important=0x99cc99;0x000000;true;false
 directive=0x339999;0x000000;false;true
-#identifier3=0x669999;0x000000;true;false # not in np++
+identifier3=0x669999;0x000000;true;false # not in np++
 identifier2=0x999966;0x000000;true;false
 pseudoelement=0xff8000;0x000000;true;true # not in np++
 extended_identifier=0x99cc99;0x000000;true;false # not in np++

data/rmthemegen.gemspec

@@ -4,13 +4,13 @@ require "rmthemegen/version"
 
 Gem::Specification.new do |s|
   s.name        = "rmthemegen"
-  s.version     = "0.0.39"
+  s.version     = "0.0.40"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["David Heitzman"]
   s.email       = ["evolvemeans@gmail.com"]
   s.homepage    = "http://aptifuge.com"
   s.summary     = %q{Generates RubyMine >= 3.0 editor color themes}
-  s.description = %q{}
+  s.description = %q{replace your geany editor's color scheme with a new dark one with geany_fix}
   s.rubyforge_project = "rmthemegen"
 
   s.required_ruby_version = '>= 1.8.7'
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
  
   s.add_dependency('rake') 
   s.bindir = "bin"
-  s.executables = ['bin/generate_themes.rb','bin/geanyfy.rb','bin/geanyfix.rb']
+  s.executables = ['bin/generate_themes','bin/geany_fix']
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmthemegen
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: 
   segments: 
   - 0
   - 0
-  - 39
-  version: 0.0.39
+  - 40
+  version: 0.0.40
 platform: ruby
 authors: 
 - David Heitzman
@@ -111,13 +111,13 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-description: ""
+description: replace your geany editor's color scheme with a new dark one with geany_fix
 email: 
 - evolvemeans@gmail.com
 executables: 
-- geany_fix.rb
-- geanyfy.rb
-- generate_themes.rb
+- geany_fix
+- geanyfy
+- generate_themes
 extensions: []
 
 extra_rdoc_files: []
@@ -128,9 +128,9 @@ files:
 - Gemfile
 - README
 - Rakefile
-- bin/geany_fix.rb
-- bin/geanyfy.rb
-- bin/generate_themes.rb
+- bin/geany_fix
+- bin/geanyfy
+- bin/generate_themes
 - lib/rmthemegen.rb
 - lib/rmthemegen/basis_theme.tmTheme
 - lib/rmthemegen/color/color.rb