expandsync 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8ddf4aacd31807cb6112c1f1b21107236acdfa
-  data.tar.gz: 91ea767a37797fe7b06a376350cc5c16b2974a1f
+  metadata.gz: 39e3fc74b7b97e14036f6b3328faef9930813f5f
+  data.tar.gz: e0dbeeece56ba82f1f3daa38a85ff2b370f285c2
 SHA512:
-  metadata.gz: 95fb60d96619e13024f7d3c3213b9e4a9df03185ffdbc0972bdebf1cd6acb368e1ea593d389d9cae1d3fdf2939ab6fd9ffa9fbcc07efe9a61be50fd6474fe602
-  data.tar.gz: 68ac78ebf1423078dd62e0489fdc952bd36b9163e51e48a54076b268ccbaf7ff9980dc4ac412c47550774f921b9a0bf3e9189fad37a429c5d7b6ad5b0c016339
+  metadata.gz: 8bc18828f6874276b291fcfd72e8eb2d115e8d2bd92d20321ceab20db3522613b1541ee2ef1f4b3e5b0c21aab71f8a09a0d6a5323bf386b88890353e1f464678
+  data.tar.gz: 5589cfdbbecba36bea6680c5889c391426711d8f04b5be8de2cfb035dcb13462e3fb7b83ebd8d572d597bc56d81b56955b499051858e084080a94c1873e7ac0d

data/.gitignore

@@ -1,4 +1,5 @@
+Gemfile.lock
+.bundle
 .DS_Store
 results.html
-pkg
-html
+*.gem

data/Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     expandsync (0.1.0)
-      methadone (~> 1.3.1)
-      nokogiri (~> 1.6.1)
+      methadone (~> 1.3, >= 1.3.1)
+      nokogiri (~> 1.6, >= 1.6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -25,7 +25,6 @@ GEM
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    json (1.8.1)
     methadone (1.3.2)
       bundler
     mini_portile (0.5.2)
@@ -33,10 +32,7 @@ GEM
     multi_test (0.0.3)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    nori (2.3.0)
     rake (0.9.6)
-    rdoc (4.1.1)
-      json (~> 1.4)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
 
@@ -44,9 +40,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  bundler (~> 1.5)
+  aruba (~> 0)
+  bundler
   expandsync!
-  nori
-  rake (~> 0.9.2)
-  rdoc
+  rake

data/README.md

@@ -7,9 +7,37 @@ A simple engine to sync aText and TextExpander iOS.
 
     $ gem install expandsync
 
+# Warning
+
+ExpandSync is still *heavily* in development; as such, expect this repository to change daily. **USE AT YOUR OWN DISCRETION.**
+  
 # Usage
 
-TODO: Write usage instructions here
+TODO: Write better usage instructions
+
+Syntax and usage can be accessed by running `expandsync --help`:
+
+```
+$ expandsync --help
+Usage: expandsync [options] atext_filepath
+
+An engine for synchronizing snippets from aText on OS X and TextExpander iOS
+
+v0.1.0
+
+Options:
+    -h, --help                       Show command line help
+        --version                    Show help/version info
+    -a FILEPATH                      Specify an output location for aText rules (default to /Users/abach/aText-snippets.csv})
+    -n                               Disable backing up of Settings.textexpander (RUN AT YOUR OWN RISK!)
+    -t FILEPATH                      Specify a location for the TextExpander iOS XML file
+    -v, --verbose                    Turn on verbose output
+
+Arguments:
+
+    atext_filepath
+        The filepath to a CSV file exported from aText
+```
 
 # Contributing
 

data/Rakefile

@@ -1,61 +1,39 @@
-def dump_load_path
-  puts $LOAD_PATH.join("\n")
-  found = nil
-  $LOAD_PATH.each do |path|
-    if File.exists?(File.join(path,"rspec"))
-      puts "Found rspec in #{path}"
-      if File.exists?(File.join(path,"rspec","core"))
-        puts "Found core"
-        if File.exists?(File.join(path,"rspec","core","rake_task"))
-          puts "Found rake_task"
-          found = path
-        else
-          puts "!! no rake_task"
-        end
-      else
-        puts "!!! no core"
-      end
-    end
-  end
-  if found.nil?
-    puts "Didn't find rspec/core/rake_task anywhere"
-  else
-    puts "Found in #{path}"
-  end
-end
-require 'bundler'
 require 'rake/clean'
-
-require 'rake/testtask'
-
+require 'rubygems'
+require 'rubygems/package_task'
 require 'cucumber'
 require 'cucumber/rake/task'
-gem 'rdoc' # we need the installed RDoc gem, not the system one
-require 'rdoc/task'
+spec = eval(File.read('expandsync.gemspec'))
 
-include Rake::DSL
-
-Bundler::GemHelper.install_tasks
-
-
-Rake::TestTask.new do |t|
-  t.pattern = 'test/tc_*.rb'
+Gem::PackageTask.new(spec) do |pkg|
 end
 
-
 CUKE_RESULTS = 'results.html'
 CLEAN << CUKE_RESULTS
+
+desc 'Run features'
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty --no-source -x"
+  opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x"
+  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
+  t.cucumber_opts =  opts
   t.fork = false
 end
 
-Rake::RDocTask.new do |rd|
-  
-  rd.main = "README.rdoc"
-  
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+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
 end
 
-task :default => [:test,:features]
+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']
+end
 
+task :default => [:test,:features]

data/bin/expandsync

@@ -2,6 +2,7 @@
 
 require 'csv'
 require 'expandsync'
+require 'fileutils'
 require 'methadone'
 require 'nokogiri'
 require 'optparse'
@@ -12,31 +13,31 @@ class App
   
   main do |atext_filepath|
     begin
-      # Collect snippets from both aText and TextExpander and create an
-      # array with the unique entries of both.
-      atext = AText.new(atext_filepath)
-      textexpander = TextExpander.new(options[:t] || ExpandSync::DEFAULT_TE_SNIPPET_PATH)
-      combined_snippets = (atext.snippets + textexpander.snippets).uniq { |s| s[0] }
+      atext = AText.new(atext_filepath, options[:a])
+      textexpander = TextExpander.new
       
-      # Next, create file content (CSV for aText, XML for TextExpander)
+      # Create file content (CSV for aText, XML for TextExpander)
       # that contains the correct data:
       #   1. aText CSV should contain any new TextExpander snippets.
       #   2. TextExpander XML should contain original snippets *and*
       #      any new aText snippets.
-      new_at_csv = atext.construct_data(combined_snippets - atext.snippets)
-      new_te_xml = textexpander.construct_data(combined_snippets - textexpander.snippets)
+      combined_snippets = (atext.snippets + textexpander.snippets).uniq { |s| s[0] }
+      atext.construct_data(combined_snippets - atext.snippets)
+      textexpander.construct_data(combined_snippets - textexpander.snippets)
       
-      # Save new aText snippets 
-      File.open(options[:a] || ExpandSync::DEFAULT_AT_OUTPUT_PATH, 'w') {|f| f.write(new_at_csv) }
+      # Save new aText snippets .
+      atext.save
       
-      # Backup the original TextExpander file and output the new one.
-      FileUtils.cp(ExpandSync::DEFAULT_TE_SNIPPET_PATH, ExpandSync::DEFAULT_TE_SNIPPET_PATH + '.bak')
-      File.open(ExpandSync::DEFAULT_TE_SNIPPET_PATH, 'w') {|f| f.write(new_te_xml) }
+      # Backup the original TextExpander file (unless the user has specified
+      # that they don't want a backup) and save the new one.
+      textexpander.backup unless options[:n]
+      textexpander.save
       
       # 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)
+      exit!(1)
     end
   end
 
@@ -44,9 +45,8 @@ class App
   version ExpandSync::VERSION
   
   # Flags & Switches
-  on('-a FILEPATH', "Specify an output location for aText rules (default to...})")
-  on('-n', )
-  on('-t FILEPATH', 'Specify a location for the TextExpander iOS XML file')
+  on('-a FILEPATH', "Output location for aText rules (defaults to ~/#{ AText::OUTPUT_FILENAME })")
+  on('-n', 'Disable backing up of Settings.textexpander (RUN AT YOUR OWN RISK!)')
   on('-v', '--verbose', 'Turn on verbose output')
   
   # Arguments

data/expandsync.gemspec

@@ -8,26 +8,24 @@ Gem::Specification.new do |spec|
   spec.version          = ExpandSync::VERSION
   spec.authors          = ['Aaron Bach']
   spec.email            = ['bachya1208@googlemail.com']
-  spec.summary          = ExpandSync::DESCRIPTION
-  spec.description      = 'A command line app that synchronizes text expansion snippets between aText for OS X and TextExpander for iOS'
+  spec.summary          = ExpandSync::SUMMARY
+  spec.description      = ExpandSync::DESCRIPTION
   spec.homepage         = 'https://github.com/bachya/ExpandSync'
   spec.license          = 'MIT'
   spec.platform         = Gem::Platform::RUBY
-                        
+
+  spec.require_paths    = ["lib"]
   spec.files            = `git ls-files -z`.split("\x0")
   spec.executables      = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths    = ["lib"]
   
   spec.license          = 'MIT'
   spec.rdoc_options     = ['--charset=UTF-8']
-  spec.extra_rdoc_files = %w[README.md HISTORY.md LICENSE.txt]
+  spec.extra_rdoc_files = %w[README.md HISTORY.md LICENSE]
 
   spec.add_development_dependency('bundler', '~> 0')
   spec.add_development_dependency('rake', '~> 0')
-  spec.add_development_dependency('rdoc', '~> 0')
   spec.add_development_dependency('aruba', '~> 0')
-  spec.add_development_dependency('nori', '~> 0')
   spec.add_dependency('methadone', '~> 1.3', '>= 1.3.1')
   spec.add_dependency('nokogiri', '~> 1.6', '>= 1.6.1')
 end

data/features/1.ui.feature

@@ -1,5 +1,5 @@
 Feature: UI
-  When the user asks for help, he should be presented
+  As a user, when I ask for help, I should be presented
   with instructions on how to run the app.
 
   Scenario: Display help instructions
@@ -13,6 +13,5 @@ Feature: UI
       And the following options should be documented:
             | -a        |
             | -n        |
-            | -t        |
             | -v        |
             | --verbose |

data/features/2.run.feature

@@ -1,10 +1,25 @@
 Feature: Run
-  The user runs the app and it outputs
-  the correct files in the correct locations
+  As a user, when I run the app (w/ or w/o flags), I
+  should have the correct content be placed in the correct
+  files.
       
   Scenario: Run with no flags
-    Given an aText CSV file at "/tmp/atext.csv"
-    When I successfully run `expandsync /tmp/atext.csv`
+    Given a file located at "/tmp/expandsync/input/atext.csv"
+    When I successfully run `expandsync /tmp/expandsync/input/atext.csv`
     Then "~/aText-snippets.csv" should exist
       And "~/Dropbox/TextExpander/Settings.textexpander" should exist
-      And "~/Dropbox/TextExpander/Settings.textexpander.bak" should exist
+      And Settings.textexpander should be backed up
+
+  Scenario: Run with -a flag
+    Given a file located at "/tmp/expandsync/input/atext.csv"
+    When I run `expandsync -a /tmp/expandsync/output/aText-output.csv /tmp/expandsync/input/atext.csv`
+    Then "/tmp/expandsync/output/aText-output.csv" should exist
+      And "~/Dropbox/TextExpander/Settings.textexpander" should exist
+      And Settings.textexpander should be backed up
+
+  Scenario: Run with -n flags
+    Given a file located at "/tmp/expandsync/input/atext.csv" 
+    When I successfully run `expandsync -n /tmp/expandsync/input/atext.csv`
+    Then "~/aText-snippets.csv" should exist
+      And "~/Dropbox/TextExpander/Settings.textexpander" should exist
+      And Settings.textexpander should not be backed up

data/features/3.failures.feature

@@ -0,0 +1,14 @@
+Feature: Failures
+  As a user, when something goes wrong (either via my
+  own doing, or because of something unexpected), I
+  should be notified
+
+  Scenario: Run with bad aText Input
+    Given a file located at "/tmp/expandsync/input/random-text-file.txt"
+    When I run `expandsync /tmp/expandsync/input/random-text-file.txt`
+    Then the exit status should be 1  
+
+  Scenario: Run with bad -a flag
+    Given a file located at "/tmp/expandsync/input/atext.csv"
+    When I run `expandsync -a /asdgsaduatsidtigasd/out.csv /tmp/expandsync/input/atext.csv`
+    Then the exit status should be 1

data/features/step_definitions/expandsync_steps.rb

@@ -1,20 +1,15 @@
-require 'nori'
-
-Given(/^an aText CSV file at "(.*?)"$/) do |atext_input|
-  Dir.chdir(File.dirname(atext_input)) do
-    FileUtils.cp(File.join(TMP_DIR, 'atext.csv'), 'atext.csv')
-    FileUtils.cp(File.join(TMP_DIR, 'expected-new-textexpander.xml'), 'expected-new-textexpander.xml')
-    FileUtils.cp(File.join(TMP_DIR, 'Settings.textexpander'), '/tmp/expandsync/Dropbox/TextExpander/Settings.textexpander')
-  end
+Given(/^a file located at "(.*?)"$/) do |filepath|
+  expect(File).to exist(File.expand_path(filepath))
 end
 
 Then(/^"(.*?)" should exist$/) do |file|
   expect(File).to exist(File.expand_path(file)) 
 end
 
-Then(/^"(.*?)" should be the same as "(.*?)"$/) do |file1, file2|
-  parser = Nori.new
-  file1_xml = parser.parse(File.read(File.expand_path(file1)))
-  file2_xml = parser.parse(File.read(File.expand_path(file2)))
-  expect(file1_xml).to eq(file2_xml)
+Then(/^Settings\.textexpander should be backed up$/) do
+  expect(File).to exist("/tmp/expandsync/Dropbox/TextExpander/Settings.textexpander_#{ Time.now.utc.iso8601 }")
+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 }")
 end

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'methadone/cucumber'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
-TMP_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','tmp')
+RES_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','res')
 
 Before do
   # Using "announce" causes massive warnings on 1.9.2
@@ -12,9 +12,16 @@ Before do
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
   @original_home = ENV['HOME']
   ENV['HOME'] = "/tmp/expandsync"
+  
   FileUtils.rm_rf "/tmp/expandsync"
   FileUtils.mkdir "/tmp/expandsync"
+  FileUtils.mkdir "/tmp/expandsync/input"
+  FileUtils.mkdir "/tmp/expandsync/output"
   FileUtils.mkdir_p "/tmp/expandsync/Dropbox/TextExpander"
+  
+  FileUtils.cp(File.join(RES_DIR, 'atext.csv'), '/tmp/expandsync/input/atext.csv')
+  FileUtils.cp(File.join(RES_DIR, 'random-text-file.txt'), '/tmp/expandsync/input/random-text-file.txt')
+  FileUtils.cp(File.join(RES_DIR, 'Settings.textexpander'), '/tmp/expandsync/Dropbox/TextExpander')
 end
 
 After do

data/lib/expandsync/atext.rb

@@ -2,7 +2,16 @@
 #  AText Class
 #  ======================================================
 class AText
-  attr_accessor :filepath, :snippets
+  #  ====================================================
+  #  Constants
+  #  ====================================================
+  OUTPUT_FILENAME = 'aText-snippets.csv'
+  OUTPUT_PATH = ENV['HOME']
+
+  #  ====================================================
+  #  Attributes
+  #  ====================================================
+  attr_accessor :output_file, :snippet_csv, :snippets
 
   #  ====================================================
   #  Methods
@@ -13,12 +22,27 @@ class AText
   #  @param csv_filepath The filepath to the aText CSV
   #  @return Void
   #  ----------------------------------------------------
-  def initialize(csv_filepath)
-    begin
-      @filepath = csv_filepath
-      @snippets = CSV.read(csv_filepath)
-    rescue 
-      fail "Invalid aText CSV file: #{ csv_filepath }"
+  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
+      else
+        fail "Invalid output directory for aText: #{ custom_output_path }"        
+      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 }"
+      end
+      
+      @snippets.each { |s| s[2] = 'aText' }
+    else
+      fail "Invalid CSV file: #{ csv_filepath }"
     end
   end
   
@@ -30,6 +54,16 @@ class AText
   #  @return String
   #  ----------------------------------------------------
   def construct_data(new_snippets)
-    CSV.generate { |csv| new_snippets.each { |s| csv << [s[0], s[1]] } }
+    @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) }
   end
 end

data/lib/expandsync/constants.rb

@@ -1,9 +1,5 @@
 module ExpandSync
-  # App Info
-  DESCRIPTION = 'An engine for synchronizing snippets from aText on OS X and TextExpander iOS'
-  VERSION = '0.1.0'
-  
-  # Filepaths
-  DEFAULT_AT_OUTPUT_PATH = File.join(ENV['HOME'], 'aText-snippets.csv')
-  DEFAULT_TE_SNIPPET_PATH = File.join(ENV['HOME'], 'Dropbox', 'TextExpander', 'Settings.textexpander')
+  DESCRIPTION = 'A command line app that synchronizes text expansion snippets between aText for OS X and TextExpander for iOS'
+  SUMMARY = 'An engine for synchronizing snippets from aText on OS X and TextExpander iOS'
+  VERSION = '0.1.1'
 end

data/lib/expandsync/textexpander.rb

@@ -5,7 +5,16 @@ require 'time'
 #  TextExpander Class
 #  ======================================================
 class TextExpander
-  attr_accessor :base_xml, :filepath, :snippets
+  #  ====================================================
+  #  Constants
+  #  ====================================================
+  OUTPUT_FILENAME = 'Settings.textexpander'
+  OUTPUT_PATH = File.join(ENV['HOME'], 'Dropbox', 'TextExpander')
+
+  #  ====================================================
+  #  Attributes
+  #  ====================================================
+  attr_accessor :base_xml, :output_file, :snippet_xml, :snippets
 
   #  ====================================================
   #  Methods
@@ -13,24 +22,24 @@ class TextExpander
   #  ----------------------------------------------------
   #  initialize method
   #
-  #  @param csv_filepath The filepath to the aText CSV
   #  @return Void
   #  ----------------------------------------------------
-  def initialize(xml_filepath)
+  def initialize
     begin
       xpath = "/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']/*"
-      @filepath = xml_filepath
-      @base_xml = Nokogiri::XML(File.open(filepath))
+      @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] 
+        arr << [abbreviation, value, 'TextExpander'] 
       end
       @snippets = arr
     rescue 
-      fail "Invalid TextExpander XML file: #{ xml_filepath }"
+      fail "Invalid TextExpander XML file: #{ @output_file }"
     end
   end
 
@@ -46,7 +55,7 @@ class TextExpander
     groups_xpath = "/*/*/array[preceding-sibling::key[1] = 'groupsTE2']"
     at_group_xpath = groups_xpath + "/*[string[preceding-sibling::key[1] = 'name'] = 'aText']"
     
-    if @base_xml.xpath(at_group_xpath).empty?
+    if @snippet_xml.xpath(at_group_xpath).empty?
       xml_builder = Nokogiri::XML::Builder.new do |xml|
         xml.dict {
           xml.key 'expandAfterMode'
@@ -71,18 +80,17 @@ class TextExpander
           xml.integer '1'
         }
       end
-      @base_xml.xpath(groups_xpath)[0].add_child(xml_builder.doc.root.to_xml)
-      # File.open(File.join(ENV['HOME'], 'Downloads/test.xml'), 'w') { |f| @base_xml.write_xml_to f }
+      @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 |u| 
-            xml.string u
+          snippet_uuids.each do |uuid| 
+            xml.string uuid
           end
         }
       end
       
-      @base_xml.xpath(at_group_xpath + "/array[preceding-sibling::key[1] = 'snippetUUIDs']")[0].add_child(xml_builder.doc.root.children.to_xml)
+      @snippet_xml.xpath(at_group_xpath + "/array[preceding-sibling::key[1] = 'snippetUUIDs']")[0].add_child(xml_builder.doc.root.children.to_xml)
     end
   end
 
@@ -129,21 +137,42 @@ class TextExpander
       }
     end
     
-    @base_xml.xpath("/*/*/array[preceding-sibling::key[1] = 'snippetsTE2']")[0].add_child(xml_builder.doc.root.children.to_xml)
+    @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
   #
-  #  Outputs an XML file with the new snippets added.
+  #  Modifies the currently held XML data with new snippet
+  #  information.
   #  @param new_snippets The snippet array to use
-  #  @return String
+  #  @return Void
   #  ----------------------------------------------------
   def construct_data(new_snippets)
     snippet_uuids = add_snippets_to_base_xml(new_snippets)
     add_group_to_base_xml(snippet_uuids)
-    @base_xml
+  end
+
+  #  ----------------------------------------------------
+  #  save method
+  #
+  #  Saves the current snippets to Settings.textexpander.
+  #  @return Void
+  #  ----------------------------------------------------
+  def save
+    File.open(@output_file, 'w') {|f| f.write(@snippet_xml) }
   end
 
   private :add_group_to_base_xml, :add_snippets_to_base_xml

data/res/pretty-print.xsl

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output omit-xml-declaration="no" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>

data/res/random-text-file.txt

@@ -0,0 +1 @@
+Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expandsync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nori
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  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
@@ -130,21 +102,20 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - HISTORY.md
-- LICENSE.txt
+- LICENSE
 files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
 - LICENSE
-- LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - bin/expandsync
 - expandsync.gemspec
 - features/1.ui.feature
 - features/2.run.feature
+- features/3.failures.feature
 - features/step_definitions/expandsync_steps.rb
 - features/support/env.rb
 - lib/expandsync.rb
@@ -153,11 +124,13 @@ files:
 - lib/expandsync/constants.rb
 - lib/expandsync/exceptions.rb
 - lib/expandsync/textexpander.rb
+- res/Settings.textexpander
+- res/atext.csv
+- res/expected-new-atext.csv
+- res/expected-new-textexpander.xml
+- res/pretty-print.xsl
+- res/random-text-file.txt
 - test/tc_something.rb
-- tmp/Settings.textexpander
-- tmp/atext.csv
-- tmp/expected-new-atext.csv
-- tmp/expected-new-textexpander.xml
 homepage: https://github.com/bachya/ExpandSync
 licenses:
 - MIT
@@ -187,6 +160,7 @@ summary: An engine for synchronizing snippets from aText on OS X and TextExpande
 test_files:
 - features/1.ui.feature
 - features/2.run.feature
+- features/3.failures.feature
 - features/step_definitions/expandsync_steps.rb
 - features/support/env.rb
 - test/tc_something.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Aaron Bach
-
-MIT License
-
-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.

data/README.rdoc

@@ -1,19 +0,0 @@
-= expandsync - DESCRIBE YOUR GEM
-
-Author::  YOUR NAME (YOUR EMAIL)
-Copyright:: Copyright (c) 2014 YOUR NAME
-
-
-DESCRIBE YOUR GEM HERE
-
-== Links
-
-* {Source on Github}[LINK TO GITHUB]
-* RDoc[LINK TO RDOC.INFO]
-
-== Install
-
-== Examples
-
-== Contributing
-