nimbu 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d7d01bb99d406ca5718d7144a86ac847e1dd406
-  data.tar.gz: b20d6a92f23e1d3e35d2be2497f0ac4afaf05484
+  metadata.gz: 21566ccc6a6c4e11b1313dc2f795b21b933f3953
+  data.tar.gz: c3f6dd296d5251a9f7ab40d86a9c0822dca34717
 SHA512:
-  metadata.gz: ba5804f0fbf643a933a7c108f8957e0c5c9de0cd5254f31ac552adadcd6fe2790ef114df0421f82de6f72b88e91234805436cfe9c49bc64b5b9575c394075031
-  data.tar.gz: 0d4299b4d55489ce381b8dcc3ba0f997716e38a1b8af08580a186e79edb2ee72193df512dbb3890c76a37b3565090029cacea4e88108dfb4b3eed43eb8e0bc3b
+  metadata.gz: 947e1335f4f309ce12f40f3bd33d779e541d7ae29f835e92ed43a18f9bc60c93c7975d001a48d5ce05c2c527f689a92848fdc27e74e5db831d45c0283cb9cd12
+  data.tar.gz: 9774466aad7d5c7bf26f83fc2dc0139e82abd5897da32da17915151bcfc95628f7496b5ad16e7cf0de37f51ef2fefddd3e3f8e382e49333bc485f820b0cde7d9

data/lib/nimbu/command/themes.rb

@@ -90,12 +90,16 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
   # --css, --css-only   # only push template code
   # --js, --js-only   # only push template code
   # --images-only   # only push new images
+  # --fonts-only    # only push fonts
+  # --only          # only push the files given on the command line
   #
   def push
     liquid_only = options[:liquid]
     css_only = options[:css]
     js_only = options[:js]
     images_only = options[:images_only]
+    fonts_only = options[:fonts_only]
+    files_only = options[:only]
 
     # if !input.to_s.strip.empty?
     #   theme = input.to_s.strip
@@ -104,14 +108,105 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     theme = Nimbu::Auth.theme
     display "Pushing layouts, templates and assets for '#{theme}' to the server:"
 
-    layouts_glob = Dir.glob("#{Dir.pwd}/layouts/**/*.liquid")
-    layouts_files = layouts_glob.map {|dir| dir.gsub("#{Dir.pwd}/layouts/","")}
-    templates_glob = Dir.glob("#{Dir.pwd}/templates/**/*.liquid")
-    templates_files = templates_glob.map {|dir| dir.gsub("#{Dir.pwd}/templates/","")}
-    snippets_glob = Dir.glob("#{Dir.pwd}/snippets/**/*.liquid")
-    snippets_files = snippets_glob.map {|dir| dir.gsub("#{Dir.pwd}/snippets/","")}
+    # What should we push?
+    push_liquid = !(css_only || js_only || images_only || fonts_only)
+    push_css = !(liquid_only || js_only || images_only || fonts_only)
+    push_js = !(liquid_only || css_only || images_only || fonts_only)
+    push_images = !(liquid_only || css_only || js_only || fonts_only)
+    push_fonts = !(liquid_only || css_only || js_only || images_only)
+
+    if push_fonts
+      if files_only
+        font_files = args.select{|file| file.start_with?("fonts", "")}.map{|file| file.gsub("fonts/", "")}
+      else
+        font_files = Dir.glob("#{Dir.pwd}/fonts/**/*").map {|dir| dir.gsub("#{Dir.pwd}/fonts/","")} rescue []
+      end
+
+      print "\nFonts:\n"
+      font_files.each do |font|
+        file = "#{Dir.pwd}/fonts/#{font}"
+        next if File.directory?(file) || (!anyFileWithWord?(css_glob,font) && !anyFileWithWord?(js_glob,font) && !anyFileWithWord?(layouts_glob,font) && !anyFileWithWord?(templates_glob,font) && !anyFileWithWord?(snippets_glob,font))
+        io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
+        nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "fonts/#{font}", :file => io})
+        print " - fonts/#{font}"
+        print " (ok)\n"
+      end
+    end
+
+    if push_images
+      if files_only
+        image_files = args.select{|file| file.start_with?("images", "")}.map{|file| file.gsub("images/", "")}
+      else
+        image_files = Dir.glob("#{Dir.pwd}/images/**/*").map {|dir| dir.gsub("#{Dir.pwd}/images/","")}
+      end
+
+      print "\nImages:\n"
+      image_files.each do |image|
+        file = "#{Dir.pwd}/images/#{image}"
+        next if File.directory?(file) || (!anyFileWithWord?(css_glob,image) && !anyFileWithWord?(js_glob,image) && !anyFileWithWord?(layouts_glob,image) && !anyFileWithWord?(templates_glob,image) && !anyFileWithWord?(snippets_glob,image))
+        io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
+        nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "images/#{image}", :file => io})
+        print " - images/#{image}"
+        print " (ok)\n"
+      end
+    end
+
+    if push_css
+      if files_only
+        css_files = args.select{|file| file.start_with?("stylesheets")}.map{|file| file.gsub("stylesheets/", "")}
+      else
+        css_files = css_glob.map {|dir| dir.gsub("#{Dir.pwd}/stylesheets/","")}
+      end
+
+      print "\nStylesheets:\n"
+      css_files.each do |css|
+        file = "#{Dir.pwd}/stylesheets/#{css}"
+        next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,css) && !anyFileWithWord?(templates_glob,css) && !anyFileWithWord?(snippets_glob,css))
+        io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
+        nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "stylesheets/#{css}", :file => io})
+        print " - stylesheets/#{css}"
+        print " (ok)\n"
+      end
+    end
+
+    if push_js
+      if files_only
+        js_files = args.select{|file| file.start_with?("javascripts", "")}.map{|file| file.gsub("javascripts/", "")}
+      else
+        js_files = js_glob.map {|dir| dir.gsub("#{Dir.pwd}/javascripts/","")}
+      end
+
+      print "\nJavascripts:\n"
+      js_files.each do |js|
+        file = "#{Dir.pwd}/javascripts/#{js}"
+        next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,js) && !anyFileWithWord?(templates_glob,js) && !anyFileWithWord?(snippets_glob,js))
+        io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
+        nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "javascripts/#{js}", :file => io})
+        print " - javascripts/#{js}"
+        print " (ok)\n"
+      end
+    end
+
+    if push_liquid
+      if files_only
+        layouts_files = args.select{|file| file.start_with?("layouts")}.map{|file| file.gsub("layouts/", "")}
+        templates_files = args.select{|file| file.start_with?("templates")}.map{|file| file.gsub("templates/", "")}
+        snippets_files = args.select{|file| file.start_with?("snippets")}.map{|file| file.gsub("snippets/", "")}
+      else
+        layouts_files = layouts_glob.map {|dir| dir.gsub("#{Dir.pwd}/layouts/","")}
+        templates_files = templates_glob.map {|dir| dir.gsub("#{Dir.pwd}/templates/","")}
+        snippets_files = snippets_glob.map {|dir| dir.gsub("#{Dir.pwd}/snippets/","")}
+      end
+
+      print "\nSnippets:\n"
+      snippets_files.each do |snippet|
+        file = "#{Dir.pwd}/snippets/#{snippet}"
+        next if File.directory?(file)
+        print " - snippets/#{snippet}"
+        nimbu.themes(:subdomain => Nimbu::Auth.site).snippets(:theme_id => theme).create({:name => snippet, :content => IO.read(file).force_encoding('UTF-8')})
+        print " (ok)\n"
+      end
 
-    if !(css_only || js_only || images_only)
       print "\nLayouts:\n"
       layouts_files.each do |layout|
         file = "#{Dir.pwd}/layouts/#{layout}"
@@ -129,72 +224,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.themes(:subdomain => Nimbu::Auth.site).templates(:theme_id => theme).create({:name => template, :content => IO.read(file).force_encoding('UTF-8')})
         print " (ok)\n"
       end
-
-      print "\nSnippets:\n"
-      snippets_files.each do |snippet|
-        file = "#{Dir.pwd}/snippets/#{snippet}"
-        next if File.directory?(file)
-        print " - snippets/#{snippet}"
-        nimbu.themes(:subdomain => Nimbu::Auth.site).snippets(:theme_id => theme).create({:name => snippet, :content => IO.read(file).force_encoding('UTF-8')})
-        print " (ok)\n"
-      end
     end
 
-    if !liquid_only
-      css_glob = Dir.glob("#{Dir.pwd}/stylesheets/**/*.css")
-      css_files = css_glob.map {|dir| dir.gsub("#{Dir.pwd}/stylesheets/","")}
-      if !(js_only || images_only)
-        print "\nStylesheet:\n"
-        css_files.each do |css|
-          file = "#{Dir.pwd}/stylesheets/#{css}"
-          next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,css) && !anyFileWithWord?(templates_glob,css) && !anyFileWithWord?(snippets_glob,css))
-          io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
-          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "stylesheets/#{css}", :file => io})
-          print " - stylesheets/#{css}"
-          print " (ok)\n"
-        end
-      end
-
-      js_glob = Dir.glob("#{Dir.pwd}/javascripts/**/*.js")
-      js_files = js_glob.map {|dir| dir.gsub("#{Dir.pwd}/javascripts/","")}
-      if !(css_only || images_only)
-        print "\nJavascripts:\n"
-        js_files.each do |js|
-          file = "#{Dir.pwd}/javascripts/#{js}"
-          next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,js) && !anyFileWithWord?(templates_glob,js) && !anyFileWithWord?(snippets_glob,js))
-          io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
-          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "javascripts/#{js}", :file => io})
-          print " - javascripts/#{js}"
-          print " (ok)\n"
-        end
-      end
-
-      image_files = Dir.glob("#{Dir.pwd}/images/**/*").map {|dir| dir.gsub("#{Dir.pwd}/images/","")}
-      if !(css_only || js_only)
-        print "\nImages:\n"
-        image_files.each do |image|
-          file = "#{Dir.pwd}/images/#{image}"
-          next if File.directory?(file) || (!anyFileWithWord?(css_glob,image) && !anyFileWithWord?(js_glob,image) && !anyFileWithWord?(layouts_glob,image) && !anyFileWithWord?(templates_glob,image) && !anyFileWithWord?(snippets_glob,image))
-          io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
-          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "images/#{image}", :file => io})
-          print " - images/#{image}"
-          print " (ok)\n"
-        end
-      end
-
-      font_files = Dir.glob("#{Dir.pwd}/fonts/**/*").map {|dir| dir.gsub("#{Dir.pwd}/fonts/","")} rescue []
-      if !(css_only || js_only)
-        print "\nFonts:\n"
-        font_files.each do |font|
-          file = "#{Dir.pwd}/fonts/#{font}"
-          next if File.directory?(file) || (!anyFileWithWord?(css_glob,font) && !anyFileWithWord?(js_glob,font) && !anyFileWithWord?(layouts_glob,font) && !anyFileWithWord?(templates_glob,font) && !anyFileWithWord?(snippets_glob,font))
-          io = Faraday::UploadIO.new(File.open(file), 'application/octet-stream', File.basename(file))
-          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "fonts/#{font}", :file => io})
-          print " - fonts/#{font}"
-          print " (ok)\n"
-        end
-      end
-    end
   end
 
   private
@@ -242,4 +273,25 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
       end
     end
   end
+
+  def layouts_glob
+    @layouts_glob ||= Dir.glob("#{Dir.pwd}/layouts/**/*.liquid")
+  end
+
+  def templates_glob
+    @templates_glob ||= Dir.glob("#{Dir.pwd}/templates/**/*.liquid")
+  end
+
+  def snippets_glob
+    @snippets_glob ||= Dir.glob("#{Dir.pwd}/snippets/**/*.liquid")
+  end
+
+  def css_glob
+    @css_glob ||= Dir.glob("#{Dir.pwd}/stylesheets/**/*.css")
+  end
+
+  def js_glob
+    @js_glob ||= Dir.glob("#{Dir.pwd}/javascripts/**/*.js")
+  end
+
 end

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor