chimplate 0.0.2 → 0.0.3

data/Gemfile

@@ -1,6 +1,2 @@
 source 'https://rubygems.org'
-gem "mailchimp"
-gem "json"
-gem "thor"
-gem "listen"
 gemspec

data/Gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: .
   specs:
-    chimplate (0.0.1)
+    chimplate (0.0.2)
+      diffy
       json
+      listen
       mailchimp
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    diffy (2.1.4)
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     json (1.7.7)
+    listen (0.7.3)
     mailchimp (0.0.8)
       httparty
     multi_json (1.7.2)
@@ -24,6 +28,3 @@ PLATFORMS
 
 DEPENDENCIES
   chimplate!
-  json
-  mailchimp
-  thor

data/bin/chimplate

@@ -34,8 +34,14 @@ class ChimplateCli < Thor
   end
 
   desc "push", "Push current disk versions of templates to mailchimp."
+  option :filename, :default => ""
   def push
-    Chimplate::Base.push
+    unless options[:filename].empty?
+      puts "File #{options[:filename]} does not exist." and return unless File.exists? options[:filename]
+      Chimplate::Base.push_file(options[:filename])
+    else
+      Chimplate::Base.push
+    end
   end
 
   desc "watch", "Watch for file changes and push them to Mailchimp."
@@ -48,6 +54,17 @@ class ChimplateCli < Thor
 
     listener.start
   end
+
+  desc "diff", "Show the difference between Mailchimp's copy and my copy."
+  option :filename, :default => ""
+  def diff
+    unless options[:filename].empty?
+      puts "File #{options[:filename]} does not exist." and return unless File.exists? options[:filename]
+      Chimplate::Base.diff_file(options[:filename])
+    else
+      Chimplate::Base.diff
+    end
+  end
 end
 
 ChimplateCli.start(ARGV)

data/chimplate.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "thor"
   s.add_dependency "listen"
+  s.add_dependency "diffy"
 end

data/lib/chimplate/base.rb

@@ -1,5 +1,6 @@
 require "mailchimp"
 require "yaml"
+require "diffy"
 
 module Chimplate
   class Base
@@ -15,27 +16,27 @@ module Chimplate
 
     def self.pull(options = {})
       api.templates["user"].each do |template_info|
-      template = api.templateInfo "tid" => template_info["id"]
-      filename = Dir.pwd + "/" + template_info["id"].to_s + "-" + sanitize_filename(template_info["name"]) + ".html"
-
-      write = true
-      if File.exist? filename
-        if options[:force] || yield(filename)
-          FileUtils.rm filename 
-        else
-          puts "Skipping #{filename}.\n"
-          write = false
+        template = api.templateInfo "tid" => template_info["id"]
+        filename = Dir.pwd + "/" + template_info["id"].to_s + "-" + sanitize_filename(template_info["name"]) + ".html"
+
+        write = true
+        if File.exist? filename
+          if options[:force] || yield(filename)
+            FileUtils.rm filename 
+          else
+            puts "Skipping #{filename}.\n"
+            write = false
+          end
         end
-      end
 
-      if write
-        File.open(filename, "w+") do |file|
-          file.write(template["source"])
-          puts "Saved template #{filename}.\n";
+        if write
+          File.open(filename, "w+") do |file|
+            file.write(template["source"])
+            puts "Saved template #{filename}.\n";
+          end
         end
       end
     end
-    end
 
     def self.push
       Dir.glob("*-*.html").each do |template_filename|
@@ -44,23 +45,47 @@ module Chimplate
     end
 
     def self.push_file(template_filename)
-      tid, template_name = template_filename.gsub(".html", "").split("-")
+      file_data = file_info(template_filename)
 
       File.open template_filename, "rb" do |file|
-        if tid == "new"
-          new_tid = api.templateAdd :name => template_name.gsub("_", " "), :html => file.read
-          new_filename = new_tid.to_s + '-' + template_name + ".html"
+        if file_data[:tid] == "new"
+          new_tid = api.templateAdd :name => file_data[:template_name].gsub("_", " "), :html => file.read
+          new_filename = new_tid.to_s + '-' + file_data[:template_name] + ".html"
           FileUtils.mv template_filename, new_filename
 
           puts "Saved new template #{new_filename}.\n";
         else
-          api.templateUpdate "id" => tid, "values" => { "html" => file.read }
+          api.templateUpdate "id" => file_data[:tid], "values" => { "html" => file.read }
           puts "Updated template #{template_filename}.\n";
         end
       end
     end
 
+    def self.diff_file(template_filename)
+      file_info = file_info(template_filename)
+
+      File.open template_filename, "rb" do |file|
+        template = api.templateInfo "tid" => file_info[:tid]
+        puts "Diff between local #{template_filename} and remote template.\n\n"
+
+        puts Diffy::Diff.new(template["source"].chomp, file.read.chomp, :context => 2, :allow_empty_diff => true).to_s(:color)
+      end
+    end
+
+    def self.diff
+      Dir.glob("*-*.html").each do |template_filename|
+        diff_file(template_filename)
+        puts "\n\n----------------------------------------------------------\n\n"
+      end
+    end
+
     protected
+      def self.file_info(filename)
+        tid, template_name = filename.gsub(".html", "").split("-")
+
+        return {:tid => tid, :template_name => template_name}
+      end
+
       def self.api
         if !File.exist? destination
           puts "No config file here, please run `chimplate setup` first"

data/lib/chimplate/version.rb

@@ -1,3 +1,3 @@
 module Chimplate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/readme.md

@@ -7,7 +7,7 @@ What is it?
 I've found myself doing a lot of template editing for clients lately,
 and though Mailchimp's excellent in-browser editing tools make it easy
 to get up and running, they don't provide any of the tools required for
-managing a large number of with lots of common elements, managing
+managing a large number of templates with lots of common elements, managing
 revisions, etc, etc.
 
 There are tons of tools available to make this process easier, chiefly
@@ -87,6 +87,18 @@ want to create a new file, kill the watch process via Ctrl+C, make the
 new file, run `chimplate push`, and then re-start the `chimplate watch`
 process to resume pushing your changes on the fly back to Mailchimp.
 
+Gotchas
+-------
+
+Once you start editing your templates this way, it's important to avoid
+using Mailchimp's editor in your browser. If you make changes there, and
+then don't pull them with Chimplate before pushing your local copies
+again, you could overwrite the changes you made directly in Mailchimp!
+There's no function in Chimplate (or in Mailchimp) for checking
+modification times, so you could lose work if you aren't rigorous about
+doing it all in one place (or at least all via a git repo to centralize
+version control). You have been warned!
+
 TODO
 ----
 
@@ -96,5 +108,7 @@ it doesn't match the expected format Chimplate will probably give you a nasty
 stack trace and run home to mommy. Sorry! I hope to fix this soon...
 3. Provide some sort of support for template deletion. At this point I'm
 happy leaving it to the Mailchimp UI, since accidental deletion would be
-a pain. But since we have local copies now, it wouldn't be too bad! Git
-FTW!
+a bummer.
+4. Provide some diff support, so you could diff a template to see what's
+   different between your local copy and Mailchimp's version before you
+push.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chimplate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A small command line utility to ease local editing and version control
   of mailchimp user templates.
 email: matt@bitforge.us