nimbu 0.5.9 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b793979f2d9f9e9c660aa4d3e174fb1c09726d
-  data.tar.gz: a42ee27c1fd151a73c6345f9e49f50c0d2172ab3
+  metadata.gz: be56f5a0a4728e77c601391db05061c4029eb0f2
+  data.tar.gz: 3df40f954df3c4ef85b1250f003c1d2e2b4772fc
 SHA512:
-  metadata.gz: 91155767ca0d7c66253b8e8773a9bce89185adb86e05755160a14dce417f3c182aaef329ff934235af4be4af681e028d5f4a8073ee3c6f3b6e023af7b422b420
-  data.tar.gz: 5394c86eebfd7eac95e0c9c8fd3a0676cb3b0bd5f9a9f3279d4dd46141287e9ef5280963e6e5b8bae7ec1e91fe416696a838c623bc641c1ea3fd4ed3d365143e
+  metadata.gz: c83f492ced2ed8de9ccaa517c8673e702ea86b6dfd934e73dd759a3e5b2fbd38f976aa9c645150c21bde5c44cc8a8b723674631ada8d4728f01461e43ba6ea59
+  data.tar.gz: 942b58332982dc57969fbeea22a48843cd87564bd7de129f69498aec1db36e64e481b5fab532641bfff4b555cab084a5b5de58cde8af13fc9de90077e4d45f50

data/lib/nimbu/command/themes.rb

@@ -65,6 +65,24 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     end
   end
 
+  # themes
+  #
+  # list available commands or display help for a specific command
+  #
+  def diff
+    require 'diffy'
+    @diff = {}
+    input = args.shift.downcase rescue nil
+    theme = if !input.to_s.strip.empty?
+      input.to_s.strip
+    else
+      Nimbu::Auth.theme
+    end
+    display "\nShowing differences between local and server\nlayouts, templates, snippets and assets for '#{theme.green.bold}':"
+    json = nimbu.themes(:subdomain => Nimbu::Auth.site).get(theme)
+    check_differences(json, theme, "layouts", "templates", "snippets")
+  end
+
   # themes:push
   #
   # push all layouts, templates and assets
@@ -171,6 +189,34 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
 
   private
 
+  def check_differences(contents, theme, *types)
+    types.each do |type|
+      if contents[type].any?
+        print "\n\n#{type.capitalize}: ".bold
+        contents[type].each { |layout| compare(layout, theme, type) }
+        display "no differences found!" if @diff[type].nil?
+      end
+    end
+  end
+
+  def compare(data, theme, type)
+    file = "#{Dir.pwd}/#{type}/#{data["name"]}"
+    if File.exists?(file)
+      local = IO.read(file).force_encoding('UTF-8').to_s.gsub(/\r\n?/, "\n").strip
+      api = nimbu.themes(:subdomain => Nimbu::Auth.site)
+      json = api.send(type, :theme_id => theme).get(:"#{type[0..-2]}_id" => data['id'])
+      server = json["code"].to_s.force_encoding('UTF-8').gsub(/\r\n?/, "\n").strip
+      diff = Diffy::Diff.new(local, server, :include_diff_info => true, :context => 3).to_s(:color).strip
+      if diff != ""
+        print "\n - #{type}/#{data["name"]} has #{'changed'.yellow.bold }:\n\n#{diff}" 
+        @diff[type] = true
+      end
+    else
+      @diff[type] = true
+      print "\n - #{type}/#{data["name"]} is #{'missing'.red.bold }"
+    end
+  end
+
   def anyFileWithWord?(glob,word)
     found = false
     glob.each do |file|

data/lib/nimbu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: '0.6'
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement