topinambour 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb50fe8c98f7c0088d012be2121e40231ec8f26
-  data.tar.gz: b1e33c5e616b8326bbc057452e42dd83c5f6208d
+  metadata.gz: b2c58d89e07204813f4116f6fb82d4ae0d3469f7
+  data.tar.gz: 1cc5cd49e4893852c8aef7336de6bcadfbf80218
 SHA512:
-  metadata.gz: bf5d252a6ebf8b900ab6a21e484412a78845f57ef45b5bdc7f0b6f648d88e23481b1936b9a1831921bf43ceba045309ab5b343af4d462a84a7dd7c49703d0812
-  data.tar.gz: 9059949fd99bf6160a88c452e566e9a01e3313af4651d37ca57316343fa93797c80dcc4e86bb863a1def017c30ea406e2b90c4ae16c2392a57becc6caf9ec843
+  metadata.gz: bc8234743007101b0b8a1edbb3e995c9afea0c898f3543306c37121b8019f192eaac418c14bea5e5932438b61d097f11d3d6b6e85a350e1e6142fea54a6a40fe
+  data.tar.gz: 7efda03dabd821aa1b82e87f9cdb5935c195f23f54c23f36a6b23168b82c2226abf4698e77709870ecc1aef8a9cf8355456b7085470bf98a2fd1d8a10c425977

data/README.md

@@ -1,8 +1,10 @@
 # Topinambour
 
-[![Gem Version](https://badge.fury.io/rb/Topinambour.svg)](https://badge.fury.io/rb/Topinambour)
+[![Gem Version](https://badge.fury.io/rb/topinambour.svg)](https://badge.fury.io/rb/topinambour)
+[![Code Climate](https://codeclimate.com/github/cedlemo/topinambour/badges/gpa.svg)](https://codeclimate.com/github/cedlemo/topinambour)
 
-<a href="https://raw.github.com/cedlemo/germinal/master/screenshot1.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot1_prev.png" width="576" height="324" alt="Screenshot"></a>
+
+<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot1.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot1_prev.png" width="576" height="324" alt="Screenshot"></a>
 
 Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the project [ruby-gnome2](https://github.com/ruby-gnome2/ruby-gnome2). I have written it for testing purpose, but Topinambour works well and I use it as my primary terminal emulator.
 
@@ -10,17 +12,17 @@ Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the pr
 
 *    tabs supports
 *    tabs can be reordered or selected through the preview mode ( `Shift + Ctrl + o` )
-<a href="https://raw.github.com/cedlemo/germinal/master/screenshot2.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot2_prev.png" width="576" height="324" alt="Screenshot"></a>
+<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot2.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot2_prev.png" width="576" height="324" alt="Screenshot"></a>
 
 *    Each tab can be named.
 *    The configuration can be done via a Css file
 *    Terminal colors can be changed on the fly and saved in the CSS configuration file
-<a href="https://raw.github.com/cedlemo/germinal/master/screenshot3.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot3_prev.png" width="576" height="324" alt="Screenshot"></a>
+<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot3.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot3_prev.png" width="576" height="324" alt="Screenshot"></a>
 *    Terminal font can be changed on the fly and saved in the CSS configuration file
-<a href="https://raw.github.com/cedlemo/germinal/master/screenshot4.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot4_prev.png" width="576" height="324" alt="Screenshot"></a>
+<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot4.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot4_prev.png" width="576" height="324" alt="Screenshot"></a>
 
 *    The Css file can be edited in a tab of Topinambour and saved. Each modifications are applied while you are writting them. (Use `Shift + Ctrl + w` to close the editor)
-<a href="https://raw.github.com/cedlemo/germinal/master/screenshot5.png"><img src="https://raw.github.com/cedlemo/germinal/master/screenshot5_prev.png" width="576" height="324" alt="Screenshot"></a>
+<a href="https://raw.github.com/cedlemo/topinambour/master/screenshot5.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot5_prev.png" width="576" height="324" alt="Screenshot"></a>
 *   Topinambour allows users to modify existing modules. For example if a user copy the css_editor.rb in the directory *~/.config/Topinambour/lib/css_editor.rb*, he should be able to modify it in order to fit its needs. 
 
 ##  TODO:
@@ -51,7 +53,7 @@ Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the pr
 
 ## User configuration
 
-It can be found in the file `$HOME/.config/Topinambour/germinal.css` (Be carefull by default Topinambour use fish as a default shell, if you want to use another one specify it in the germinal.css file)
+It can be found in the file `$HOME/.config/Topinambour/topinambour.css` (Be carefull by default Topinambour use fish as a default shell, if you want to use another one specify it in the topinambour.css file)
 
 ```css
 *{
@@ -125,7 +127,7 @@ Each time you modify this configuration via the interface of Topinambour (termin
 
     FileUtils.mv(USR_CSS, "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup")
 
-Which means that the old file can be something like that : *germinal.css_2016-12-5-13-20.backup*.
+Which means that the old file can be something like that : *topinambour.css_2016-12-5-13-20.backup*.
 
 ## Installation
 
@@ -156,8 +158,8 @@ the ruby gem binaries (for example).
 
 ##### Get the sources
 
-    git clone https://github.com/cedlemo/germinal.git
-    cd germinal/bin
+    git clone https://github.com/cedlemo/topinambour.git
+    cd topinambour/bin
     
 ##### Edit the files Topinambour and test
   The filenames correspond to their functionnalities.

data/bin/topinambour

@@ -29,10 +29,10 @@ ROOT_PATH = File.expand_path("#{CURRENT_PATH}/..")
 LIB_PATH = "#{CURRENT_PATH}/../lib"
 DATA_PATH = "#{CURRENT_PATH}/../data"
 CONFIG_DIR = File.expand_path("#{ENV['HOME']}/.config/Topinambour")
-USR_CSS = "#{CONFIG_DIR}/germinal.css"
+USR_CSS = "#{CONFIG_DIR}/topinambour.css"
 USR_LIB_PATH  = "#{CONFIG_DIR}/lib"
-gresource_bin = "#{DATA_PATH}/germinal.gresource"
-gresource_xml = "#{DATA_PATH}/germinal.gresource.xml"
+gresource_bin = "#{DATA_PATH}/topinambour.gresource"
+gresource_xml = "#{DATA_PATH}/topinambour.gresource.xml"
 
 system("glib-compile-resources",
        "--target", gresource_bin,
@@ -55,8 +55,8 @@ terminal_chooser headerbar shortcuts window resize_message css_editor).each do |
   end
 end
 
-Gtk::IconTheme.default.add_resource_path("/com/github/cedlemo/germinal/icons")
+Gtk::IconTheme.default.add_resource_path("/com/github/cedlemo/topinambour/icons")
 
-germinal = TopinambourApplication.new
+topinambour = TopinambourApplication.new
 
-exit(germinal.run([$PROGRAM_NAME] + ARGV))
+exit(topinambour.run([$PROGRAM_NAME] + ARGV))

data/data/{germinal.gresource.xml → topinambour.gresource.xml}

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/com/github/cedlemo/germinal">
+  <gresource prefix="/com/github/cedlemo/topinambour">
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">app-menu.ui</file>
     <file preprocess="xml-stripblanks">window-menu.ui</file>
     <file preprocess="xml-stripblanks">terminal-menu.ui</file>
-    <file>germinal.css</file>
+    <file>topinambour.css</file>
     <file>application-exit-symbolic.svg</file>
     <file>color-select-symbolic.svg</file>
     <file>emblem-photos-symbolic.svg</file>
@@ -15,7 +15,7 @@
     <file>tab-new-symbolic.svg</file>
     <file>window-close-symbolic.svg</file>
   </gresource>
-  <gresource prefix="/com/github/cedlemo/germinal/icons">
+  <gresource prefix="/com/github/cedlemo/topinambour/icons">
     <file>application-exit-symbolic.svg</file>
     <file>color-select-symbolic.svg</file>
     <file>emblem-photos-symbolic.svg</file>

data/lib/application.rb

@@ -17,7 +17,7 @@
 class TopinambourApplication < Gtk::Application
   attr_reader :provider
   def initialize
-    super("com.github.cedlemo.germinal", :non_unique)
+    super("com.github.cedlemo.topinambour", :non_unique)
 
     signal_connect "startup" do |application|
       load_css_config
@@ -55,14 +55,14 @@ class TopinambourApplication < Gtk::Application
   private
 
   def load_menu_ui_in(application)
-    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/app-menu.ui")
+    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/app-menu.ui")
     app_menu = builder["appmenu"]
     application.app_menu = app_menu
   end
 
   def load_css_config
     @provider = Gtk::CssProvider.new
-    default_css = Gio::Resources.lookup_data("/com/github/cedlemo/germinal/germinal.css", 0)
+    default_css = Gio::Resources.lookup_data("/com/github/cedlemo/topinambour/topinambour.css", 0)
     if File.exist?(USR_CSS)
       begin
         @provider.load(:path => USR_CSS)

data/lib/css_handler.rb

@@ -1,47 +1,121 @@
+require "sass"
+require "gtk3" # to remove
+
 module CssHandler
-  def css_file?(filename)
+  def self.css_file?(filename)
     filename =~ /^.*\.css$/ ? true : false
   end
-  
-  def scss_file?(filename)
+
+  def self.scss_file?(filename)
     filename =~ /^.*\.scss$/ ? true : false
   end
-  
-  def sass_file?(filename)
+
+  def self.sass_file?(filename)
     filename =~ /^.*\.sass$/ ? true : false
   end
 
-  def to_css(filename)
+  def self.to_css(filename)
     content = File.open(filename, "r").read
     if css_file?(filename) || scss_file?(filename)
       Sass::Engine.new(content, :syntax => :scss).render
-    else
+    elsif sass_file?(filename)
       Sass::Engine.new(content, :syntax => :sass).render
     else
       puts "Your theme file must be a css, scss or sass file"
       exit 1
     end
   end
-  
-  def color_property?(value)
+
+  def self.to_engine(filename)
+    content = File.open(filename, "r").read
+    if css_file?(filename) || scss_file?(filename)
+      Sass::Engine.new(content, :syntax => :scss)
+    elsif sass_file?(filename)
+      Sass::Engine.new(content, :syntax => :sass)
+    else
+      puts "Your theme file must be a css, scss or sass file"
+      exit 1
+    end
+  end
+
+  def self.color_property?(value)
+    parsed_color = nil
     begin
-      Gdk::RGBA.parse(value)
+      parsed_color = Gdk::RGBA.parse(value)
     rescue
-      false
+      parsed_color = nil
     end
-    true
+    parsed_color ? true : false
   end
-  
-  def property_to_css_instructions(name, value)
-    if value.class == String && color_property?(value) 
+
+  def self.property_to_css_instructions(name, value)
+    if value.class == String && color_property?(value)
       "#{name}: #{value};\n"
-    else value.class == String
+    elsif value.class == String
       "#{name}: \"#{value}\";\n"
     else
       "#{name}: #{value};\n"
-    end 
+    end
+  end
+
+  def self.props_with_name(tree, prop_name)
+    props = []
+    tree.children.each do |node|
+      node.each do |prop|
+        next if prop.class != Sass::Tree::PropNode
+        name = prop.name[0]
+        props << prop if name == prop_name
+      end
+    end
+    props
   end
   
-  def get_global
+  def self.prop_position(prop)
+    source_range = prop.source_range
+    [source_range.start_pos, source_range.end_pos]
+  end
+
+  def self.property_defined?(tree, name)
+    tree.children.each do |node|
+      node.each do |prop|
+        next if prop.class != Sass::Tree::PropNode
+        return true if prop.name[0] == name
+      end
+    end
+    false
+  end
 
+  def self.modify_property(filename, tree, prop)
+    # Get the property line/pos via the tree
+    # modify the existing prop in the file
+    #   create a temp file
+    #   copy initial file and modify the part we want
+    #   replace initial file with temp file
+  end
+
+  def self.append_property_in_universal_selector(filename, tree, prop)
+    # Get the universal selector line/pos via the tree
+    # append our property at the end of this selector
+  end
+
+  def self.selectors_with_name(tree, sel_name)
+    selectors = []
+    tree.children.each do |node|
+      next unless node.class == Sass::Tree::RuleNode
+      selectors << node
+    end
+    selectors
+  end  
+  
+  def self.update_css(filename, properties)
+    engine = to_engine(filename)
+    tree = engine.to_tree
+    properties.each do |prop|
+      if property_defined?(tree, prop[:name])
+        modify_property(filename, tree, prop)
+      else
+        append_property_in_universal_selector(filename, tree, prop)
+      end
+    end
+  end
 end

data/lib/headerbar.rb

@@ -83,7 +83,7 @@ SECTOOLTIP
 
   def self.generate_open_menu_button(window)
     gen_icon_button("open-menu-symbolic", "Main Menu") do |button|
-      builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/window-menu.ui")
+      builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/window-menu.ui")
       menu = Gtk::Menu.new(builder["winmenu"])
       menu.attach_to_widget(button)
       menu.children[0].signal_connect("activate") { window.show_css_editor }

data/lib/terminal.rb

@@ -70,7 +70,7 @@ class TopinambourTerminal < Vte::Terminal
       end
     end
 
-    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/germinal/terminal-menu.ui")
+    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/terminal-menu.ui")
     @menu = Gtk::Popover.new(self, builder["termmenu"])
 
     signal_connect "button-press-event" do |widget, event|

data/lib/window.rb

@@ -26,7 +26,7 @@ class TopinambourWindow < Gtk::ApplicationWindow
 
   def initialize(application)
     super(:application => application)
-    set_icon_from_file("#{DATA_PATH}/germinal-icon.png")
+    set_icon_from_file("#{DATA_PATH}/topinambour-icon.png")
     load_css_properties
     set_position(:center)
     create_header_bar
@@ -118,10 +118,10 @@ class TopinambourWindow < Gtk::ApplicationWindow
                           "comments" => "Terminal Emulator based on the ruby bindings of Gtk3 and Vte3",
                           "copyright" => "Copyright (C) 2015-2016 Cédric Le Moigne",
                           "license" => "This program is licenced under the licence GPL-3.0 and later.",
-                          "logo" => Gdk::Pixbuf.new("#{DATA_PATH}/germinal-icon-128.png"),
+                          "logo" => Gdk::Pixbuf.new("#{DATA_PATH}/topinambour-icon-128.png"),
                           "program_name" => "Topinambour",
                           "version" => "1.2.3",
-                          "website" => "https://github.com/cedlemo/germinal",
+                          "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -86,17 +86,17 @@ files:
 - data/color-select-symbolic.svg
 - data/emblem-photos-symbolic.svg
 - data/font-select-symbolic.svg
-- data/germinal-icon-128.png
-- data/germinal-icon-16.png
-- data/germinal-icon-32.png
-- data/germinal-icon-64.png
-- data/germinal-icon.png
-- data/germinal.css
-- data/germinal.gresource.xml
 - data/pan-end-symbolic.svg
 - data/pan-start-symbolic.svg
 - data/tab-new-symbolic.svg
 - data/terminal-menu.ui
+- data/topinambour-icon-128.png
+- data/topinambour-icon-16.png
+- data/topinambour-icon-32.png
+- data/topinambour-icon-64.png
+- data/topinambour-icon.png
+- data/topinambour.css
+- data/topinambour.gresource.xml
 - data/window-close-symbolic.svg
 - data/window-menu.ui
 - data/window.ui