xcodesnippets 0.2.0 → 0.2.1

data/README.md

@@ -16,6 +16,18 @@ If you aren't familiar with RubyGems, fire up a Terminal and run the following c
     
 If you are using a tool like [RVM](https://rvm.beginrescueend.com/), the `sudo` will probably be unnecessary.
 
+## Migrating your existing snippets
+
+If you already have some snippets in `~/Library/Developer/Xcode/UserData/CodeSnippets/` you will want to bring these under `xcodesnippets` control before you do anything else.
+
+Fortunately, `xcodesnippets` will do this for you; not only that, but it will rename each snippet file to use a more meaningful title (the one you gave it within Xcode).
+
+To migrate your exiting snippets, run:
+
+    $ xcodesnippets migrate
+    
+A list of your existing snippets will be displayed and with your confirmation, they will be copied into the default `xcodesnippet` bundle, removed from the Xcode snippets directory, then re-linked back to the `xcodesnippet` versions (see "How xcodesnippets works" for more).
+
 ## Installing a code snippet
 
 Code snippets are distributed as property list files with a `.codesnippet` extension. If you have created any custom code snippets in Xcode 4, you will find them in your home directory, under `~/Library/Developer/Xcode/UserData/CodeSnippets/`. The files are named using GUIDs. Any `codesnippet` file created from within Xcode 4, or manually if you are comfortable editing the files yourself (they are just plists) are installable using `xcodesnippets`.
@@ -39,6 +51,7 @@ For a full list of commands and options, run `xcodesnippets --help`.
 ## TODO
 
 * Installing snippets and bundles directly from a URL
+* Activating snippets from outside the managed directory - great for using your own snippets from their local source repos.
 * Generating snippet bundles from a folder of snippets ready for distribution
 * Commands for listing installed bundles and their contents
 * Commands for activating and de-activating individual bundles/snippets

data/lib/xcode_snippets/main.rb

@@ -56,7 +56,10 @@ Warning: this will move #{snippets_to_migrate.count} code snippets under xcodesn
 
 Continue? (y/n)
 }
-        agree(prompt) unless skip_confirm?
+        if skip_confirm?
+          return true
+        end
+        agree(prompt)
       end
     end
     

data/lib/xcode_snippets/manifest.rb

@@ -51,8 +51,13 @@ module XcodeSnippets
       @data[snippet.key]
     end
     
-    def generate_new_symlink
-      File.join(@xcode_snippets_install_path, "#{@uuid_generator.generate}.codesnippet")
+    def generate_symlink_for_snippet(snippet)
+      snippet.set_guid!(generate_guid)
+      File.join(@xcode_snippets_install_path, "#{snippet.guid}.codesnippet")
+    end
+    
+    def generate_guid
+      @uuid_generator.generate
     end
     
     private

data/lib/xcode_snippets/snippet.rb

@@ -7,13 +7,18 @@ module XcodeSnippets
       @bundle = bundle
     end
     
+    def set_guid!(new_guid)
+      metadata.guid = new_guid
+      metadata.save_to(path)
+    end
+    
     def copy_to_bundle(bundle)
       FileUtils.cp(path, bundle.path)
       self.class.new(File.join(bundle.path, name), bundle)
     end
     
     def activate(manifest)
-      @symlink = manifest.generate_new_symlink
+      @symlink = manifest.generate_symlink_for_snippet(self)
       FileUtils.symlink(path, symlink)
       manifest.add_snippet(self)
     end
@@ -30,6 +35,10 @@ module XcodeSnippets
       File.basename(@path)
     end
     
+    def guid
+      metadata.guid
+    end
+    
     def metadata
       @metadata ||= MetaData.from_file(path)
     end
@@ -59,6 +68,20 @@ module XcodeSnippets
       def title
         @data["IDECodeSnippetTitle"]
       end
+      
+      def guid
+        @data["IDECodeSnippetIdentifier"]
+      end
+      
+      def guid=(new_guid)
+        @data["IDECodeSnippetIdentifier"] = new_guid
+      end
+      
+      def save_to(path)
+        File.open(path, "w") do |io|
+          io.write @data.to_plist
+        end
+      end
     end
   end
 end

data/lib/xcode_snippets/version.rb

@@ -2,7 +2,7 @@ module XcodeSnippets
   module Version
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{TINY}"

data/spec/snippet_manager_spec.rb

@@ -24,7 +24,11 @@ describe "SnippetManager" do
       File.exist?(expected_path).should be_true
     end
     
-    it "creates a GUID symlink to the installed snippet in the Xcode snippets directory" do
+    it "generates a new GUID identifier for the snippet" do
+      @snippet.guid.should_not be_nil
+    end
+    
+    it "creates a symlink to the installed snippet in the Xcode snippets directory based on the snippet's generated GUID" do
       symlink = @manager.manifest.symlink_for_snippet(@snippet)
       File.exist?(symlink).should be_true
     end
@@ -33,6 +37,10 @@ describe "SnippetManager" do
       @manager.manifest.should have_snippet(@snippet)
     end
     
+    it "updates the snippet's metadata to reflect it's generated GUID" do
+      @snippet.metadata.guid.should == @snippet.guid
+    end
+    
   end
   
   describe "#install_snippets_from_paths" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcodesnippets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &2156053140 !ruby/object:Gem::Requirement
+  requirement: &2164421420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156053140
+  version_requirements: *2164421420
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2156045060 !ruby/object:Gem::Requirement
+  requirement: &2164419300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156045060
+  version_requirements: *2164419300
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &2156044380 !ruby/object:Gem::Requirement
+  requirement: &2164412280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156044380
+  version_requirements: *2164412280
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &2164409580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2164409580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156043980 !ruby/object:Gem::Requirement
+  requirement: &2164408180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156043980
+  version_requirements: *2164408180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156043300 !ruby/object:Gem::Requirement
+  requirement: &2164407640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156043300
+  version_requirements: *2164407640
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156042600 !ruby/object:Gem::Requirement
+  requirement: &2164407080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156042600
+  version_requirements: *2164407080
 description: 
 email: luke@lukeredpath.co.uk
 executables: