expandsync 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b47ba4f7292bf9155e7d8cfc7941f71101f7809
-  data.tar.gz: 02614276a21b6f4b0cf961c99f8c67c78d544c9a
+  metadata.gz: f68be2f33e8ccba10bca1ccdbe3d22f209256b48
+  data.tar.gz: d93f58763fb2d3c44a66c9ec44402c707fc24bff
 SHA512:
-  metadata.gz: c7f002d6cb68e442268786b8d0af895e81abce64dbb78f838695a33f2d99c08c0a262cc34edce36c894efba40c8f1fc6666373c2ff8341c705d7ba4aed088fcb
-  data.tar.gz: 0f5cdc5aed4f59f8d5dda01ae4d484ff0995649ee002baf108c4077f86cf0a7bcd61c91a0002f4d69bc22a557c9cdd8e777be606c51b1f07ffededfa0e38bcbb
+  metadata.gz: 8704dd2a387a22cd156083dab719f77c6c1d2b2d523007b40e94ec42e4ad96e3fb58501080439e655de53349ecba8b23c8693e1cc8992b17d8fd22b52dbfd6c0
+  data.tar.gz: bbca23f9cd02b41f6189184e2e8fb346ddc1697c4d1e5b6dcf8dfd7fda1076434e4aaeb3e630756b334a6da7f8621a34290d178292827692fa1f2665b45abeda

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - 2.1.0
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+  - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    expandsync (0.1.1)
+    expandsync (0.2.0)
+      cliutils
       methadone (~> 1.3, >= 1.3.1)
       nokogiri (~> 1.6, >= 1.6.1)
 
@@ -15,21 +16,22 @@ GEM
     builder (3.2.2)
     childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.11)
+    cliutils (1.1.0)
+    cucumber (1.3.12)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     methadone (1.3.2)
       bundler
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     multi_json (1.9.0)
-    multi_test (0.0.3)
+    multi_test (0.1.1)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     rake (0.9.6)

data/Rakefile

@@ -1,39 +1,51 @@
 require 'rake/clean'
 require 'rubygems'
-require 'rubygems/package_task'
-require 'cucumber'
-require 'cucumber/rake/task'
+
+def version
+  contents = File.read File.expand_path('../lib/expandsync/constants.rb', __FILE__)
+  contents[/\sVERSION = '([^']+)'/, 1]
+end
+
 spec = eval(File.read('expandsync.gemspec'))
 
-Gem::PackageTask.new(spec) do |pkg|
+require 'rake/testtask'
+desc 'Run unit tests'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
 end
 
+require 'cucumber'
+require 'cucumber/rake/task'
 CUKE_RESULTS = 'results.html'
 CLEAN << CUKE_RESULTS
-
-desc 'Run features'
+desc 'Run Cucumber features'
 Cucumber::Rake::Task.new(:features) do |t|
-  opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x"
+  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
   opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
   t.cucumber_opts =  opts
   t.fork = false
 end
 
-desc 'Run features tagged as work-in-progress (@wip)'
-Cucumber::Rake::Task.new('features:wip') do |t|
-  tag_opts = ' --tags ~@pending'
-  tag_opts = ' --tags @wip'
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
-  t.fork = false
+desc "Release ExpandSync version #{ version }"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  
+  sh "git commit --allow-empty -a -m 'Release #{ version }'"
+  sh "git tag v#{ version }"
+  sh "git push origin master"
+  sh "git push origin v#{ version }"
+  sh "gem push pkg/expandsync-#{ version }.gem"
 end
 
-task :cucumber => :features
-task 'cucumber:wip' => 'features:wip'
-task :wip => 'features:wip'
-require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+desc "Build the gem"
+task :build do
+  FileUtils.mkdir_p "pkg"
+  sh "gem build expandsync.gemspec"
+  FileUtils.mv("./expandsync-#{ version }.gem", "pkg")
 end
 
-task :default => [:test,:features]
+task :default => [:test, :features]

data/bin/expandsync

@@ -1,20 +1,48 @@
 #!/usr/bin/env ruby
-
-require 'csv'
+# Encoding: utf-8
+#--------------------------------------------------------------------
+# ExpandSync
+#
+# Synchronizes text expansion snippets between aText and
+# TextExpander Touch
+#
+# Copyright (c) 2014
+# Aaron Bach <bachya1208@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#--------------------------------------------------------------------
+require 'cliutils'
 require 'expandsync'
-require 'fileutils'
 require 'methadone'
-require 'nokogiri'
 require 'optparse'
 
 class App
+  include CLIUtils::Messenging
   include Methadone::Main
-  include Methadone::CLILogging
   
   main do |atext_filepath|
     begin
-      atext = AText.new(atext_filepath, options[:a])
-      textexpander = TextExpander.new
+      atext = ExpandSync::AText.new(atext_filepath, options[:a])
+      textexpander = ExpandSync::TextExpander.new
       
       # Create file content (CSV for aText, XML for TextExpander)
       # that contains the correct data:
@@ -36,7 +64,7 @@ class App
       # This has to be here so that my Cucumber Aruba tests work. Don't ask why.
       leak_exceptions(true)
     rescue StandardError => e
-      ExpandSync::CLIMessage.error(e, false)
+      messenger.error(e.to_s)
       exit!(1)
     end
   end
@@ -45,7 +73,7 @@ class App
   version ExpandSync::VERSION
   
   # Flags & Switches
-  on('-a FILEPATH', "Output location for aText rules (defaults to ~/#{ AText::OUTPUT_FILENAME })")
+  on('-a FILEPATH', "Output location for aText rules (defaults to ~/#{ ExpandSync::AText::OUTPUT_FILENAME })")
   on('-n', 'Disable backing up of Settings.textexpander (RUN AT YOUR OWN RISK!)')
   on('-v', '--verbose', 'Turn on verbose output')
   

data/expandsync.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'expandsync/version'
+require 'expandsync/constants'
 
 Gem::Specification.new do |spec|
   spec.name             = 'expandsync'
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency('rake', '~> 0')
   spec.add_development_dependency('aruba', '~> 0')
+  spec.add_dependency('cliutils', '~> 0')
   spec.add_dependency('methadone', '~> 1.3', '>= 1.3.1')
   spec.add_dependency('nokogiri', '~> 1.6', '>= 1.6.1')
 end

data/features/step_definitions/expandsync_steps.rb

@@ -7,9 +7,9 @@ Then(/^"(.*?)" should exist$/) do |file|
 end
 
 Then(/^Settings\.textexpander should be backed up$/) do
-  expect(File).to exist("/tmp/expandsync/Dropbox/TextExpander/Settings.textexpander_#{ Time.now.utc.iso8601 }")
+  expect(Dir['/tmp/expandsync/Dropbox/TextExpander/*'].count).to eq(2)
 end
 
 Then(/^Settings\.textexpander should not be backed up$/) do
-  expect(File).to_not exist("/tmp/expandsync/Dropbox/TextExpander/Settings.textexpander_#{ Time.now.utc.iso8601 }")
+  expect(Dir['/tmp/expandsync/Dropbox/TextExpander/*'].count).to eq(1)
 end

data/lib/expandsync/atext.rb

@@ -1,69 +1,64 @@
-#  ======================================================
-#  AText Class
-#  ======================================================
-class AText
-  #  ====================================================
-  #  Constants
-  #  ====================================================
-  OUTPUT_FILENAME = 'aText-snippets.csv'
-  OUTPUT_PATH = ENV['HOME']
+require 'csv'
 
-  #  ====================================================
-  #  Attributes
-  #  ====================================================
-  attr_accessor :output_file, :snippet_csv, :snippets
+module ExpandSync
+  # AText Class
+  class AText
+    # The output filename
+    OUTPUT_FILENAME = 'aText-snippets.csv'
 
-  #  ====================================================
-  #  Methods
-  #  ====================================================
-  #  ----------------------------------------------------
-  #  initialize method
-  #
-  #  @param csv_filepath The filepath to the aText CSV
-  #  @return Void
-  #  ----------------------------------------------------
-  def initialize(csv_filepath, custom_output_path)
-    if custom_output_path.nil?
-      @output_file = File.join(OUTPUT_PATH, OUTPUT_FILENAME)
-    else
-      if Dir.exists?(File.dirname(custom_output_path))
-        @output_file = custom_output_path
+    # The output filepath
+    OUTPUT_PATH = ENV['HOME']
+
+    # Stores the output filepath.
+    # @return [String]
+    attr_accessor :output_file
+
+    # Stores a CSV string of the snippets.
+    # @return [String]
+    attr_accessor :snippet_csv
+
+    # Stores an array of snippets.
+    # @return [Array]
+    attr_accessor :snippets
+
+    # Initialize by loading snippets from an aText CSV.
+    # @param [String] csv_filepath The filepath to the aText CSV
+    # @return [void]
+    def initialize(csv_filepath, custom_output_path)
+      if custom_output_path.nil?
+        @output_file = File.join(OUTPUT_PATH, OUTPUT_FILENAME)
       else
-        fail "Invalid output directory for aText: #{ custom_output_path }"        
+        if Dir.exists?(File.dirname(custom_output_path))
+          @output_file = custom_output_path
+        else
+          fail "Invalid output directory for aText: #{ custom_output_path }"
+        end
       end
-    end
-    
-    if File.exists?(csv_filepath) && File.extname(csv_filepath) == '.csv'
-      begin  
-        @snippets = CSV.read(csv_filepath)
-      rescue 
-        fail "Could not load CSV from file: #{ csv_filepath }"
+
+      if File.exists?(csv_filepath) && File.extname(csv_filepath) == '.csv'
+        begin
+          @snippets = CSV.read(csv_filepath)
+        rescue
+          fail "Could not load CSV from file: #{ csv_filepath }"
+        end
+
+        @snippets.each { |s| s[2] = 'aText' }
+      else
+        fail "Invalid CSV file: #{ csv_filepath }"
       end
-      
-      @snippets.each { |s| s[2] = 'aText' }
-    else
-      fail "Invalid CSV file: #{ csv_filepath }"
     end
-  end
-  
-  #  ----------------------------------------------------
-  #  construct_data method
-  #
-  #  Outputs a CSV listing of the supplied snippets
-  #  @param new_snippets The snippet array to use
-  #  @return String
-  #  ----------------------------------------------------
-  def construct_data(new_snippets)
-    @snippet_csv = CSV.generate { |csv| new_snippets.each { |s| csv << [s[0], s[1]] } }
-  end
 
-  #  ----------------------------------------------------
-  #  save method
-  #
-  #  Saves the current snippets to Settings.textexpander.
-  #  @return Void
-  #  ----------------------------------------------------
-  def save
-    File.open(@output_file, 'w') {|f| f.write(@snippet_csv) }
+    # Outputs a CSV listing of the supplied snippets
+    # @param [Array] new_snippets The snippet array to use
+    # @return [String]
+    def construct_data(new_snippets)
+      @snippet_csv = CSV.generate { |csv| new_snippets.each { |s| csv << [s[0], s[1]] } }
+    end
+
+    # Saves the current snippets to Settings.textexpander.
+    # @return [void]
+    def save
+      File.open(@output_file, 'w') {|f| f.write(@snippet_csv) }
+    end
   end
 end

data/lib/expandsync/{version.rb → constants.rb}

@@ -1,5 +1,10 @@
 module ExpandSync
+  # The Gem's description
   DESCRIPTION = 'A command line app that synchronizes text expansion snippets between aText for OS X and TextExpander for iOS'
+
+  # The Gem's summary
   SUMMARY = 'An engine for synchronizing snippets from aText on OS X and TextExpander Touch'
-  VERSION = '0.1.3'
+
+  # The Gem's version
+  VERSION = '0.2.0'
 end

data/lib/expandsync/textexpander.rb

@@ -1,179 +1,164 @@
+require 'nokogiri'
 require 'securerandom'
 require 'time'
 
-#  ======================================================
-#  TextExpander Class
-#  ======================================================
-class TextExpander
-  #  ====================================================
-  #  Constants
-  #  ====================================================
-  OUTPUT_FILENAME = 'Settings.textexpander'
-  OUTPUT_PATH = File.join(ENV['HOME'], 'Dropbox', 'TextExpander')
+module ExpandSync
+  # TextExpander Class
+  class TextExpander
+    # The output filename
+    OUTPUT_FILENAME = 'Settings.textexpander'
+  
+    # The output filepath
+    OUTPUT_PATH = File.join(ENV['HOME'], 'Dropbox', 'TextExpander')
 
-  #  ====================================================
-  #  Attributes
-  #  ====================================================
-  attr_accessor :base_xml, :output_file, :snippet_xml, :snippets
+    # Stores the initial XML as pulled from Settings.textexpander.
+    # @return [Nokogiri::XML::Document] 
+    attr_accessor :base_xml
 
-  #  ====================================================
-  #  Methods
-  #  ====================================================
-  #  ----------------------------------------------------
-  #  initialize method
-  #
-  #  @return Void
-  #  ----------------------------------------------------
-  def initialize
-    begin
-      xpath = "/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']/*"
-      @output_file = File.join(OUTPUT_PATH, OUTPUT_FILENAME)
-      @base_xml = Nokogiri::XML(File.open(@output_file))
-      @snippet_xml = @base_xml
+    # Stores the full output path for the produced XML.
+    # @return [String]
+    attr_accessor :output_file
 
-      arr = []
-      @base_xml.xpath(xpath).each do |snippet|
-        abbreviation = snippet.xpath("string[preceding-sibling::key[1] = 'abbreviation']").text
-        value = snippet.xpath("string[preceding-sibling::key[1] = 'plainText']").text
-        arr << [abbreviation, value, 'TextExpander'] 
+    # Stores the final XML to save.
+    # @return [Nokogiri::XML::Document]
+    attr_accessor :snippet_xml
+
+    # Stores an array of snippets.
+    # @return [Array]
+    attr_accessor :snippets
+
+    # Initialize by loading snippets from TextExpander.
+    # @return [void]
+    def initialize
+      begin
+        xpath = "/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']/*"
+        @output_file = File.join(OUTPUT_PATH, OUTPUT_FILENAME)
+        @base_xml = Nokogiri::XML(File.open(@output_file))
+        @snippet_xml = @base_xml
+
+        arr = []
+        @base_xml.xpath(xpath).each do |snippet|
+          abbreviation = snippet.xpath("string[preceding-sibling::key[1] = 'abbreviation']").text
+          value = snippet.xpath("string[preceding-sibling::key[1] = 'plainText']").text
+          arr << [abbreviation, value, 'TextExpander'] 
+        end
+        @snippets = arr
+      rescue 
+        fail "Invalid TextExpander XML file: #{ @output_file }"
       end
-      @snippets = arr
-    rescue 
-      fail "Invalid TextExpander XML file: #{ @output_file }"
     end
-  end
 
-  #  ----------------------------------------------------
-  #  add_groups_to_base_xml method
-  #
-  #  Creates correct group information for the provided
-  #  snippets.
-  #  @param snippets An array of snippets to add
-  #  @return Void
-  #  ----------------------------------------------------
-  def add_group_to_base_xml(snippet_uuids)
-    groups_xpath = "/*/*/array[preceding-sibling::key[1] = 'groupsTE2']"
-    at_group_xpath = groups_xpath + "/*[string[preceding-sibling::key[1] = 'name'] = 'aText']"
-    
-    if @snippet_xml.xpath(at_group_xpath).empty?
-      xml_builder = Nokogiri::XML::Builder.new do |xml|
-        xml.dict {
-          xml.key 'expandAfterMode'
-          xml.integer '0'
-          xml.key 'expanderExceptionsMode'
-          xml.integer '4'
-          xml.key 'name'
-          xml.string 'aText'
-          xml.key 'snippetUUIDs'
-          xml.array {
-            snippet_uuids.each do |u| 
-              xml.string u
-            end
-          }
-          xml.key 'suggestAbbreviations'
-          xml.integer '1'
-          xml.key 'updateFrequency'
-          xml.integer '0'
-          xml.key 'uuidString'
-          xml.string SecureRandom.uuid.upcase
-          xml.key 'writable'
-          xml.integer '1'
-        }
-      end
-      @snippet_xml.xpath(groups_xpath)[0].add_child(xml_builder.doc.root.to_xml)
-    else
-      xml_builder = Nokogiri::XML::Builder.new do |xml|
-        xml.array {
-          snippet_uuids.each do |uuid| 
-            xml.string uuid
-          end
-        }
-      end
-      
-      @snippet_xml.xpath(at_group_xpath + "/array[preceding-sibling::key[1] = 'snippetUUIDs']")[0].add_child(xml_builder.doc.root.children.to_xml)
+    # Backs up the current TextExpander settings to a
+    # timestamped file in the same directory.
+    # @return [String]
+    def backup
+      FileUtils.cp(@output_file, @output_file + "_#{ Time.now.utc.iso8601 }")
     end
-  end
 
-  #  ----------------------------------------------------
-  #  add_snippets_to_base_xml method
-  #
-  #  Inserts XML for the provided snippets to the base XML
-  #  @param snippets An array of snippets to add and returns
-  #  an array of snippet UUIDs
-  #  @return Void
-  #  ----------------------------------------------------
-  def add_snippets_to_base_xml(snippets)
-    uuids = []
+    # Modifies the currently held XML data with new snippet
+    # information.
+    # @param [Array] new_snippets The snippet array to use
+    # @return [void]
+    def construct_data(new_snippets)
+      snippet_uuids = _add_snippets_to_base_xml(new_snippets)
+      _add_group_to_base_xml(snippet_uuids)
+    end
 
-    xml_builder = Nokogiri::XML::Builder.new do |xml|
-      xml.snippets {
-        snippets.each do |s|
-          uuid = SecureRandom.uuid.upcase
-          uuids << uuid
-          
+    # Saves the current snippets to Settings.textexpander.
+    # @return [void]
+    def save
+      File.open(@output_file, 'w') {|f| f.write(@snippet_xml) }
+    end
+
+    private
+  
+    # Creates correct group information for the provided
+    # snippets.
+    # @param [Array] snippets An array of snippet UUIDs
+    # @return [void]
+    def _add_group_to_base_xml(snippet_uuids)
+      groups_xpath = "/*/*/array[preceding-sibling::key[1] = 'groupsTE2']"
+      at_group_xpath = groups_xpath + "/*[string[preceding-sibling::key[1] = 'name'] = 'aText']"
+    
+      if @snippet_xml.xpath(at_group_xpath).empty?
+        xml_builder = Nokogiri::XML::Builder.new do |xml|
           xml.dict {
-            xml.key 'abbreviation'
-            xml.string s[0]
-            xml.key 'abbreviationMode'
+            xml.key 'expandAfterMode'
             xml.integer '0'
-            xml.key 'creationDate'
-            xml.date Time.now.utc.iso8601
-            xml.key 'flags'
-            xml.integer '0'
-            xml.key 'label'
-            xml.string
-            xml.key 'modificationDate'
-            xml.date Time.now.utc.iso8601
-            xml.key 'plainText'
-            xml.string s[1]
-            xml.key 'snippetType'
-            xml.integer '0'
-            xml.key 'useCount'
+            xml.key 'expanderExceptionsMode'
+            xml.integer '4'
+            xml.key 'name'
+            xml.string 'aText'
+            xml.key 'snippetUUIDs'
+            xml.array {
+              snippet_uuids.each do |u| 
+                xml.string u
+              end
+            }
+            xml.key 'suggestAbbreviations'
+            xml.integer '1'
+            xml.key 'updateFrequency'
             xml.integer '0'
             xml.key 'uuidString'
-            xml.string uuid
+            xml.string SecureRandom.uuid.upcase
+            xml.key 'writable'
+            xml.integer '1'
+          }
+        end
+        @snippet_xml.xpath(groups_xpath)[0].add_child(xml_builder.doc.root.to_xml)
+      else
+        xml_builder = Nokogiri::XML::Builder.new do |xml|
+          xml.array {
+            snippet_uuids.each do |uuid| 
+              xml.string uuid
+            end
           }
         end
-      }
+      
+        @snippet_xml.xpath(at_group_xpath + "/array[preceding-sibling::key[1] = 'snippetUUIDs']")[0].add_child(xml_builder.doc.root.children.to_xml)
+      end
     end
-    
-    @snippet_xml.xpath("/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']")[0].add_child(xml_builder.doc.root.children.to_xml)
-    uuids
-  end
-
-  #  ----------------------------------------------------
-  #  backup method
-  #
-  #  Backs up the current TextExpander settings to a
-  #  timestamped file in the same directory.
-  #  @return String
-  #  ----------------------------------------------------
-  def backup
-    FileUtils.cp(@output_file, @output_file + "_#{ Time.now.utc.iso8601 }")
-  end
-
-  #  ----------------------------------------------------
-  #  construct_data method
-  #
-  #  Modifies the currently held XML data with new snippet
-  #  information.
-  #  @param new_snippets The snippet array to use
-  #  @return Void
-  #  ----------------------------------------------------
-  def construct_data(new_snippets)
-    snippet_uuids = add_snippets_to_base_xml(new_snippets)
-    add_group_to_base_xml(snippet_uuids)
-  end
+  
+    # Inserts XML for the provided snippets to the base XML
+    # @param [Array] snippets An array of snippets to add and returns an array of snippet UUIDs
+    # @return [void]
+    def _add_snippets_to_base_xml(snippets)
+      uuids = []
 
-  #  ----------------------------------------------------
-  #  save method
-  #
-  #  Saves the current snippets to Settings.textexpander.
-  #  @return Void
-  #  ----------------------------------------------------
-  def save
-    File.open(@output_file, 'w') {|f| f.write(@snippet_xml) }
+      xml_builder = Nokogiri::XML::Builder.new do |xml|
+        xml.snippets {
+          snippets.each do |s|
+            uuid = SecureRandom.uuid.upcase
+            uuids << uuid
+          
+            xml.dict {
+              xml.key 'abbreviation'
+              xml.string s[0]
+              xml.key 'abbreviationMode'
+              xml.integer '0'
+              xml.key 'creationDate'
+              xml.date Time.now.utc.iso8601
+              xml.key 'flags'
+              xml.integer '0'
+              xml.key 'label'
+              xml.string
+              xml.key 'modificationDate'
+              xml.date Time.now.utc.iso8601
+              xml.key 'plainText'
+              xml.string s[1]
+              xml.key 'snippetType'
+              xml.integer '0'
+              xml.key 'useCount'
+              xml.integer '0'
+              xml.key 'uuidString'
+              xml.string uuid
+            }
+          end
+        }
+      end
+    
+      @snippet_xml.xpath("/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']")[0].add_child(xml_builder.doc.root.children.to_xml)
+      uuids
+    end
   end
-
-  private :add_group_to_base_xml, :add_snippets_to_base_xml
 end

data/lib/expandsync.rb

@@ -1,8 +1,9 @@
 require "expandsync/atext"
-require "expandsync/cli_message"
+require "expandsync/constants"
 require "expandsync/textexpander"
-require "expandsync/version"
 
+# The ExpandSync module, which wraps everything
+# in this gem.
 module ExpandSync  
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expandsync
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cliutils
+  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: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -107,9 +121,8 @@ files:
 - features/support/env.rb
 - lib/expandsync.rb
 - lib/expandsync/atext.rb
-- lib/expandsync/cli_message.rb
+- lib/expandsync/constants.rb
 - lib/expandsync/textexpander.rb
-- lib/expandsync/version.rb
 - res/Settings.textexpander
 - res/atext.csv
 - res/expected-new-atext.csv

data/lib/expandsync/cli_message.rb

@@ -1,215 +0,0 @@
-module ExpandSync
-  #  ======================================================
-  #  CliManager Module
-  #  Singleton to manage common CLI interfacing
-  #  ======================================================
-  module CLIMessage
-    #  ====================================================
-    #  Methods
-    #  ====================================================
-    #  ----------------------------------------------------
-    #  error method
-    #
-    #  Outputs a formatted-red error message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.error(m, log = true)
-      Methadone::CLILogging.error(m) if log
-      puts "---> ERROR: #{ m }".red
-    end
-
-    #  ----------------------------------------------------
-    #  info method
-    #
-    #  Outputs a formatted-blue informational message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.info(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "---> INFO: #{ m }".blue
-    end
-
-    #  ----------------------------------------------------
-    #  info_block method
-    #
-    #  Wraps a block in an opening and closing info message.
-    #  @param m1 The opening message to output
-    #  @param m2 The closing message to output
-    #  @param multiline Whether the message should be multiline
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.info_block(m1, m2 = 'Done.', multiline = false, log = true)
-      if block_given?
-        if multiline
-          info(m1, log)
-        else
-          print "---> INFO: #{ m1 }".blue
-        end
-
-        yield
-
-        if multiline
-          info(m2, log)
-        else
-          puts m2.blue
-        end
-      else
-        error = 'Did not specify a valid block'
-        Methadone::CLILogging.error(error) if log
-        fail ArgumentError, error
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  prompt method
-    #
-    #  Outputs a prompt, collects the user's response, and
-    #  returns it.
-    #  @param prompt The prompt to output
-    #  @param default The default option
-    #  @return String
-    #  ----------------------------------------------------
-    def self.prompt(prompt, default = nil, log = true)
-      print "#{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".blue
-      choice = $stdin.gets.chomp
-      if choice.empty?
-        r = default
-      else
-        r = choice
-      end
-
-      Methadone::CLILogging.info("Answer to '#{ prompt }': #{r}") if log
-      r
-    end
-
-    #  ----------------------------------------------------
-    #  section method
-    #
-    #  Outputs a formatted-orange section message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.section(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "#### #{ m }".purple
-    end
-
-    #  ----------------------------------------------------
-    #  section_block method
-    #
-    #  Wraps a block in an opening and closing section
-    #  message.
-    #  @param m1 The opening message to output
-    #  @param m2 The closing message to output
-    #  @param multiline A multiline message or not
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.section_block(m, multiline = true, log = true)
-      if block_given?
-        if multiline
-          section(m, log)
-        else
-          print "#### #{ m }".purple
-        end
-
-        yield
-      else
-        error = 'Did not specify a valid block'
-        Methadone::CLILogging.error(error) if log
-        fail ArgumentError, error
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  success method
-    #
-    #  Outputs a formatted-green success message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.success(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "---> SUCCESS: #{ m }".green
-    end
-
-    #  ----------------------------------------------------
-    #  warning method
-    #
-    #  Outputs a formatted-yellow warning message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.warning(m, log = true)
-      Methadone::CLILogging.warn(m) if log
-      puts "---> WARNING: #{ m }".yellow
-    end
-  end
-end
-
-#  ======================================================
-#  String Class
-#  ======================================================
-class String
-  #  ----------------------------------------------------
-  #  colorize method
-  #
-  #  Outputs a string in a formatted color.
-  #  @param color_code The code to use
-  #  @return Void
-  #  ----------------------------------------------------
-  def colorize(color_code)
-    "\e[#{ color_code }m#{ self }\e[0m"
-  end
-
-  #  ----------------------------------------------------
-  #  blue method
-  #
-  #  Convenience method to output a blue string
-  #  @return Void
-  #  ----------------------------------------------------
-  def blue
-    colorize(34)
-  end
-
-  #  ----------------------------------------------------
-  #  green method
-  #
-  #  Convenience method to output a green string
-  #  @return Void
-  #  ----------------------------------------------------
-  def green
-    colorize(32)
-  end
-
-  #  ----------------------------------------------------
-  #  purple method
-  #
-  #  Convenience method to output a purple string
-  #  @return Void
-  #  ----------------------------------------------------
-  def purple
-    colorize(35)
-  end
-
-  #  ----------------------------------------------------
-  #  red method
-  #
-  #  Convenience method to output a red string
-  #  @return Void
-  #  ----------------------------------------------------
-  def red
-    colorize(31)
-  end
-
-  #  ----------------------------------------------------
-  #  yellow method
-  #
-  #  Convenience method to output a yellow string
-  #  @return Void
-  #  ----------------------------------------------------
-  def yellow
-    colorize(33)
-  end
-end