fontello_rails_converter 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdhMjhjZGZjMjE1NDNjYmYxNzQ3NjIwZDMyYTI1YjA5Y2FjMGRhMw==
+    ZDAzOGE4NTFmYzg4NTRkNThlOTZlZjBjNWZiY2MyMTBkYmI3ZjkxOQ==
   data.tar.gz: !binary |-
-    Y2NlYTNmNWFjMTAyMjVmN2IzNGVlN2YxYmM1ZjFjZDc5NjcwYThkNw==
+    ZWFjN2QzZTcwNWI1ZDgzMmQ3MGRkOTdhODA1NTBmMjEwMWNjYzZhMA==
 SHA512:
   metadata.gz: !binary |-
-    M2VkZGMxNmQ4MDljOTIwZWE4YjdiYjJmOTY1ZTJmNjIwY2FlNTc2ZThhNzcz
-    OWQzNzYzMmYxOWFlYjllYjI3OGE3ODU5NTQwNjA0MTZkNGEzMmMzMzQ4YTk3
-    OGI5ZTM3MGZiZTE4Mjc2OTYyYjI3ZGY1NjI2YWI1MTU3OTliYTc=
+    ODNlNzU5OTczYjU0NjI5Mzk3NWFiMzJiODM4Y2ViZWU4ZjgxMDdkOWE4ZTEx
+    MmYwNTI1MTg4N2E5ZWJhOWUzMTc1NTcxYzFhYWM4NTdmYjI2NDU4MzNlZmIz
+    NjYwZTdjYmRmZmYzZmFlMDViNDA3YzRmM2Y2NjM4M2Y4YzVkNTc=
   data.tar.gz: !binary |-
-    MGZiZTUzOTVjMWYwNTAyZTc3MTY3NDZhYTBhZDhlZTNkOGUzNTEzMTBjOWIw
-    YWUzNDk3YmJhMjhkZWQwMjVkZTUyZDQwNGVhN2RlYTYyNzM2YTRiOWU5ODli
-    ODAwYmJmYzE4YWQ0MmYyZWQ2NWU2NjBjYThkMjk3NjRiNjM0MTc=
+    MmI5NDRkNGM2NGQ2ZjgwYjNjMGRlODc4NmE3MTEyYmNhNjQ0YWExYzY0MjMw
+    N2QxZDM4NWIwYWM5NTA0ZTg1MDc2OGMzNjBmZDBkNDVmMGZmZTQzMzQyMzAz
+    YTJkNDNhNTBlOGQ1MTdlNzdkMzU5OWVlMWUxYmY5MzIxYzVlOGM=

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 0.3.1
+
+* allow configuration (and automatic creation) of icon guide directory (/rails_root/public/fontello-demo.html), fixes #19
+* more verbose/helpful CLI output
+* add `-v`/`--version` switch to CLI for printing out the current version
+
 ### 0.3.0
 
 * allow setting global options using a .yml file (e.g. /rails_root/config/fontello_rails_converter.yml)

data/bin/fontello

@@ -15,6 +15,7 @@ def set_options_based_on_rails_root(options)
   options.merge!({
     stylesheet_dir: "#{options[:asset_dir]}/stylesheets",
     font_dir: "#{options[:asset_dir]}/fonts",
+    icon_guide_dir: "#{options[:rails_root_dir]}/public",
     zip_file: "#{options[:rails_root_dir]}/tmp/fontello.zip",
     config_file: "#{options[:asset_dir]}/fonts/config.json",
     fontello_session_id_file: "#{options[:rails_root_dir]}/tmp/fontello_session_id",
@@ -24,6 +25,7 @@ end
 
 def set_options_from_file(options)
   if File.exist?(options[:options_file])
+    puts "Loading options from #{options[:options_file]}"
     options_from_file = YAML.load_file options[:options_file]
     options_from_file.each do |key, value|
       options[key.to_sym] = value  if options.keys.include?(key.to_sym)
@@ -68,7 +70,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--stylesheet-extension", "Pick between e.g. '.css.scss' or '.scss'\n\n") do |opt|
-    options[:no_download] = true
+    options[:stylesheet_extension] = opt
   end
 
   opts.separator "`download` options:"
@@ -104,10 +106,19 @@ OptionParser.new do |opts|
     options[:font_dir] = opt
   end
 
+  opts.on("--icon-guide-dir [PATH]", "Target icon guide (fontello-demo.html) directory (default: /rails_root/public)") do |opt|
+    options[:icon_guide_dir] = opt
+  end
+
   opts.on("-p", "--session-id-file [PATH]", "File to persist fontello session ID (default: /rails_root/tmp/fontello_session_id)") do |opt|
     options[:font_dir] = opt
   end
 
+  opts.on_tail("-v", "--version", "Show version") do
+    puts FontelloRailsConverter::VERSION
+    exit
+  end
+
   opts.separator "\nExamples:\n"\
                  "    fontello open -r /path/to/railsapp\n"\
                  "    fontello convert\n"\

data/lib/fontello_rails_converter/cli.rb

@@ -12,104 +12,141 @@ module FontelloRailsConverter
     end
 
     def open
+      puts "---- open ----"
       if config_file_exists?
         @fontello_api.new_session_from_config  unless @options[:open_existing] == true
         Launchy.open @fontello_api.session_url
-      else
-        puts red("there's no config file yet!")
-        puts red("follow these instructions: https://github.com/railslove/fontello_rails_converter#initial-usage")
-        puts red("to setup your project")
       end
     end
 
     def download
-      @fontello_api.new_session_from_config  if @options[:use_config] == true
+      puts "---- download ----"
+
+      if @options[:use_config] == true && config_file_exists?
+        puts "Using '#{options[:config_file]}' to create new fontello session"
+        @fontello_api.new_session_from_config
+      end
+
       File.open(@options[:zip_file], "w+") do |file|
         file.write @fontello_api.download_zip_body
       end
+      puts green "Downloaded '#{@options[:zip_file]}' from fontello (#{@fontello_api.session_url})"
     end
 
     def convert
-      self.download  unless @options[:no_download] == true || !config_file_exists?
-      self.prepare_directories
+      if @options[:no_download] == true
+        puts "Use existing '#{@options[:zip_file]}' file due to `--no-download` switch"
+      else
+        self.download
+      end
 
-      Zip::File.open(@options[:zip_file]) do |zipfile|
-        zipfile.each do |file|
-          filename = file.to_s.split("/").last
+      puts "---- convert -----"
+      prepare_directories
 
-          # stylesheets
-          if filename.end_with? '.css'
-            # extract stylesheet to target location
-            target_file = File.join @options[:stylesheet_dir], filename.gsub('.css', @options[:stylesheet_extension])
-            zipfile.extract(file, target_file) { true }
-            puts green("copied #{target_file}")
-
-            if !filename.end_with? "animation.css", "-ie7.css", "-codes.css", "-ie7-codes.css", "-embedded.css"
-              converted_css = self.convert_main_stylesheet File.read(target_file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-              File.open(target_file, 'w') { |f| f.write(converted_css) }
-              puts green("converted #{target_file} for Sass & asset pipeline")
-            end
-
-          # font files
-          elsif filename.end_with? ".eot", ".woff", ".ttf", ".svg", "config.json"
-            target_file = File.join @options[:font_dir], filename
-            zipfile.extract(file, target_file) { true }
-            puts green("copied #{target_file}")
-
-          # demo.html
-          elsif filename == 'demo.html'
-            target_file = File.join @options[:rails_root_dir], "public", "fontello-demo.html"
-            zipfile.extract(file, target_file) { true }
-            puts green("copied #{target_file}")
-
-            converted_html = convert_demo_html File.read(target_file)
-            File.open(target_file, 'w') { |f| f.write(converted_html) }
-            puts green("converted #{filename}'s HTML for asset pipeline")
-          end
+      if zip_file_exists?
+        Zip::File.open(@options[:zip_file]) do |zipfile|
+          grouped_files = zipfile.group_by{ |file| file.to_s.split("/")[1] }
 
+          copy_and_convert_stylesheets(zipfile, grouped_files['css'])
+          copy_font_files(zipfile, grouped_files['font'])
+          copy_and_convert_icon_guide(zipfile, grouped_files['demo.html'].first)
         end
       end
     end
 
-    def prepare_directories
-      FileUtils.mkdir_p @options[:font_dir]
-      FileUtils.mkdir_p @options[:stylesheet_dir]
-      FileUtils.mkdir_p @options[:asset_dir]
-    end
+    private
+
+      def prepare_directories
+        FileUtils.mkdir_p @options[:font_dir]
+        FileUtils.mkdir_p @options[:stylesheet_dir]
+        FileUtils.mkdir_p @options[:asset_dir]
+        FileUtils.mkdir_p @options[:icon_guide_dir]
+      end
 
-    def convert_main_stylesheet(content)
-      # asset URLs
-      content.gsub! /\.\.\/font\//, ""
-      content.gsub!(/url\(([^\(]+)\)/) { |m| "url(font-path(#{$1}))" }
+      def convert_main_stylesheet(content)
+        # asset URLs
+        content.gsub! /\.\.\/font\//, ""
+        content.gsub!(/url\(([^\(]+)\)/) { |m| "url(font-path(#{$1}))" }
 
-      # turn icon base class into placeholder selector
-      content.gsub! /\[class\^="icon-[^\{]+{/m, "%icon-base {"
+        # turn icon base class into placeholder selector
+        content.gsub! /\[class\^="icon-[^\{]+{/m, "%icon-base {"
 
-      # get icons
-      icons = content.scan(/\.(icon-\S+):before/).map(&:first)
+        # get icons
+        icons = content.scan(/\.(icon-\S+):before/).map(&:first)
 
-      # convert icon classes to placeholder selectors
-      content.gsub!(/^\.(icon-\S+:before) { (.+)$/) { |m| "%#{$1} { @extend %icon-base; #{$2}" }
+        # convert icon classes to placeholder selectors
+        content.gsub!(/^\.(icon-\S+:before) { (.+)$/) { |m| "%#{$1} { @extend %icon-base; #{$2}" }
 
-      # recreate icon classes using the mixins
-      if icons.any?
-        content += "\n\n"
-        icons.each do |icon|
-          content += ".#{icon} { @extend %#{icon}; }\n"
+        # recreate icon classes using the mixins
+        if icons.any?
+          content += "\n\n"
+          icons.each do |icon|
+            content += ".#{icon} { @extend %#{icon}; }\n"
+          end
         end
+
+        return content
       end
 
-      return content
-    end
+      def copy_font_files(zipfile, files)
+        puts "font files:"
+        files.select{ |file| file.to_s.end_with?(".eot", ".woff", ".ttf", ".svg", "config.json") }.each do |file|
+          filename = file.to_s.split("/").last
 
-    private
+          target_file = File.join @options[:font_dir], filename
+          zipfile.extract(file, target_file) { true }
+          puts green("Copied #{target_file}")
+        end
+      end
+
+      def copy_and_convert_stylesheets(zipfile, files)
+        puts "stylesheets:"
+        files.select{ |file| file.to_s.end_with?('.css') }.each do |file|
+          filename = file.to_s.split("/").last
+
+          # extract stylesheet to target location
+          target_file = File.join @options[:stylesheet_dir], filename.gsub('.css', @options[:stylesheet_extension])
+          zipfile.extract(file, target_file) { true }
+          puts green("Copied #{target_file}")
+
+          if !filename.end_with? "animation.css", "-ie7.css", "-codes.css", "-ie7-codes.css", "-embedded.css"
+            converted_css = convert_main_stylesheet File.read(target_file).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+            File.open(target_file, 'w') { |f| f.write(converted_css) }
+            puts green("Converted #{target_file} for Sass & asset pipeline")
+          end
+        end
+      end
+
+      def copy_and_convert_icon_guide(zipfile, demo_file)
+        puts "icon guide (demo.html):"
+
+        target_file = File.join @options[:icon_guide_dir], "fontello-demo.html"
+        zipfile.extract(demo_file, target_file) { true }
+        puts green("Copied #{target_file}")
+
+        converted_html = File.read(target_file).gsub! /css\//, "/assets/"
+        File.open(target_file, 'w') { |f| f.write(converted_html) }
+        puts green("Converted demo.html for asset pipeline")
+      end
 
       def config_file_exists?
-        @options[:config_file] && File.exist?(@options[:config_file])
+        if File.exist?(@options[:config_file])
+          true
+        else
+          puts red("missing config file: #{@options[:config_file]}")
+          puts red("follow these instructions: https://github.com/railslove/fontello_rails_converter#initial-usage")
+          puts red("to setup your project")
+          false
+        end
       end
 
-      def convert_demo_html(content)
-        content.gsub! /css\//, "/assets/"
+      def zip_file_exists?
+        if File.exist?(@options[:zip_file])
+          true
+        else
+          puts red("missing zip file: #{@options[:zip_file]}")
+          false
+        end
       end
 
   end

data/lib/fontello_rails_converter/version.rb

@@ -1,3 +1,3 @@
 module FontelloRailsConverter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontello_rails_converter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jakob Hilden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip