xcode-yamlizer 0.0.3 → 0.0.4

data/README.md

@@ -9,7 +9,11 @@ They are pain to merge and are impossible to read. YAML is pretty.
 Imagine a brave new world with XCode's `nib`s, model files, storyboards,
 project files - all in YAML. Thats what that project do!
 
-You can see how pretty it looks on Github in this sample repo.
+You can see [how] (https://github.com/darvin/iHubot/blob/xcode-yamlizer/iHubot/iHubot.xcdatamodeld/iHubot.xcdatamodel/contents.yaml)
+[pretty] (https://github.com/darvin/iHubot/blob/xcode-yamlizer/iHubot/iHubot.xcdatamodeld/.xccurrentversion.yaml)
+[it] (https://github.com/darvin/iHubot/blob/xcode-yamlizer/iHubot/ViewController.xib.yaml)
+[looks] (https://github.com/darvin/iHubot/blob/xcode-yamlizer/iHubot.xcodeproj/project.pbxproj.yaml)
+on Github in this sample [repo](https://github.com/darvin/iHubot/blob/xcode-yamlizer/).
 
 
 ## Installation

data/lib/xcode-yamlizer.rb

@@ -12,7 +12,10 @@ require 'pp'
 
 YAML_FORMATS = [".yaml", ".yml"]
 PLIST_FORMATS = [".pbxproj"]
-XML_FORMATS = [".xib", ".storyboard", /(.*).xcdatamodeld\/(.*).xcdatamodel\/contents$/]
+XML_FORMATS = [".xib", ".storyboard", \
+    /(.*).xcdatamodeld\/(.*).xcdatamodel\/contents$/, \
+    /(.*).xccurrentversion$/
+]
 
 
 XCODE_FORMATS = PLIST_FORMATS + XML_FORMATS
@@ -28,7 +31,7 @@ DUMPERS = [
 module Enumerable
   def include_filename?(filename)
     self.each do |elem|
-      if elem.kind_of? Regexp and filename =~ elem
+      if elem.kind_of? Regexp and elem.match(filename)
         return true
       end
     end
@@ -62,26 +65,14 @@ end
 
 
 def repo_add_files(files)
-  repo_dir = '.'
-  repo = Rugged::Repository.new(repo_dir)
-  index = repo.index
   files.each do |file|
-    if not index.get_entry(file)
-      #puts "Adding: #{file}"
-      `git add '#{file}'`
-    end
+    `git add '#{file}'`
   end
 end
 
 def repo_remove_files(files)
-  repo_dir = '.'
-  repo = Rugged::Repository.new(repo_dir)
-  index = repo.index
   files.each do |file|
-    if index.get_entry(file)
-      #puts "Removing: #{file}"
       `git rm --cached '#{file}'`
-    end
   end
 end
 
@@ -107,6 +98,7 @@ def repo_gitignore_add_files(files)
     
     puts "added to .gitignore:"
     puts new_ignored
+    repo_add_files [".gitignore"]
 
   end
   
@@ -128,15 +120,15 @@ module XcodeYamlizer
     formats = to_xcode ? YAML_FORMATS : XCODE_FORMATS
 
     Find.find(dir) do |path|
-      name = File.basename(path)
       if FileTest.directory?(path)
-        if ignore_paths.include?(name)
+        if ignore_paths.include?(path) or ignore_paths.include? path.gsub(/^\.\//,"")
+          puts "Ignored in submodule: #{path}" if verbose
           Find.prune
         else
           next
         end
       else
-        files += [path] if formats.include_filename? name
+        files += [path] if formats.include_filename? path
       end
     end
 
@@ -153,6 +145,7 @@ module XcodeYamlizer
     result = nil
     if YAML_FORMATS.include_filename? input
       output = input.chomp(File.extname(input))
+      FileUtils.cp output, "#{output}~"
     elsif XCODE_FORMATS.include_filename? input
       output = "#{input}.yaml"
 
@@ -191,7 +184,7 @@ module XcodeYamlizer
 
     files_remove, files_add = convert_directory('./', \
                                 false, \
-                                false, \
+                                true, \
                                 paths_to_ignore)
     files_remove = make_filepaths_non_relative files_remove
     files_add = make_filepaths_non_relative files_add

data/lib/xcode-yamlizer/dumpers.rb

@@ -1,8 +1,8 @@
 require 'osx/plist'
 require 'cobravsmongoose'
-require 'ya2yaml'
 require 'json'
 require 'yaml'
+YAML::ENGINE.yamler='syck'
 
 class Dumper
   def initialize(filename)
@@ -30,7 +30,6 @@ class YamlDumper < Dumper
     if result
       File.open(@filename, 'w') do |f|
         f.write(result)
-        #f.write(object.ya2yaml(:syck_compatible => false))
       end
     end
   end

data/lib/xcode-yamlizer/version.rb

@@ -1,3 +1,3 @@
 module XcodeYamlizer
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
 end

data/xcode-yamlizer.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "args_parser"
   gem.add_runtime_dependency 'kballard-osx-plist'
   gem.add_runtime_dependency 'cobravsmongoose'
-  gem.add_runtime_dependency 'ya2yaml'
   gem.add_runtime_dependency 'json'
   gem.add_runtime_dependency 'rugged'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcode-yamlizer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: args_parser
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ya2yaml
-  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'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement