property_synthesize_dealloc 0.1.2 → 0.2.0

data/README.markdown

@@ -2,6 +2,13 @@
 
 One of the things we do a lot of in Objective-C is outlet and variable declaration, synthesize and dealloc. Since this is a repeatable recurring event I thought I would add a little automation to the process.
 
+# Update March 19, 2011 #
+
+Xcode 4 no longer supports user scripts but instead uses Services.  
+You can create a Service with Automator.  
+Do the same as below except put the code in a Run Shell Script.  
+Set the Application to Xcode and the input as Text.  
+
 # Instructions #
 
 Install the gem.  
@@ -18,11 +25,11 @@ Make a user script in Xcode with the following:
     require "property_synthesize_dealloc"  
 
     property = PropertySynthesizeDealloc.new  
-    property.file_path = '%%%{PBXFilePath}%%%'  
     property.selection = STDIN.read  
     property.psd!   
 
-Then select the ivars you wish to make property, synthesize and dealloc declarations and execute the user script above.
+Then select the ivars you wish to make property, synthesize and dealloc declarations and execute using either a user script or    
+if using Xcode 4, a Service (as described in the Update above).
 
 
 # Overriding defaults #

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/property_synthesize_dealloc.rb

@@ -2,24 +2,26 @@ $:.unshift File.dirname(__FILE__)
 
 require "rubygems"
 require "appscript"; include Appscript
-require 'osax'; include OSAX
 require "file_checker"
 require 'configuration'
 require "converter"
 require "content_replacer"
 
 class PropertySynthesizeDealloc
-  attr_accessor :xcode, :file_path, :selection, :header_file_path, :m_file_path, :config_path
+  attr_accessor :xcode, :file_path, :selection, :header_file_path, :m_file_path, :config_path, :logging
 
   def initialize(config_file_path='')
     Configuration.new(config_file_path)
 
     @sleep_time = Configuration.settings['sleep_time']
     @xcode      = app(Configuration.settings['xcode_app_path'])
-    @file_path  = file_path
+    @logging    = false
+
+    set_file_path
   end
 
   def psd!
+    log "Selection:\n#{@selection}"
     selection_check
     file_check
 
@@ -31,6 +33,8 @@ class PropertySynthesizeDealloc
     # Update the files!
     replace_file_content(@header_file_path, header_content)
     replace_file_content(@m_file_path, m_content)
+    save_file(@header_content)
+    save_file(@m_file_path)
   end
 
   def convert_selection
@@ -43,28 +47,31 @@ class PropertySynthesizeDealloc
   protected
 
     def log(msg)
-      File.open(File.expand_path("~/desktop/errors.txt"), 'a+') { |f| f.puts msg + "\n" }
+      File.open(File.expand_path("~/desktop/errors.txt"), 'a+') { |f| f.puts msg + "\n" } if @logging
     end
 
     def dialog(msg)
+      require 'osax'; include OSAX
       osax.display_dialog(msg,
                           :buttons => ["Ok"],
                           :default_button => 1)
     end
 
     def replace_file_content(path, content)
-      @xcode.open(path)
-      sleep @sleep_time
-      if doc = find_and_save_file(path)
-        doc.contents.set(content)
-        doc.save
-        return true
+      log "Replacing: #{path}\nWith content: #{content}"
+      begin
+        if doc = @xcode.open(path)
+          sleep @sleep_time
+          save_file(path)
+          doc.contents.set(content)
+          doc.save
+        end
+      rescue => e
+        log "********************\nError Replacing File Content\n**********************\n#{e}"
       end
-      return false
     end
 
     def selection_check
-      # exit if nothing is selected
       if @selection.empty?
         dialog "There is nothing selected to convert."
         exit!
@@ -72,9 +79,8 @@ class PropertySynthesizeDealloc
     end
 
     def file_check
-      file_path_supplied?
-      save_current_file
-      find_and_save_file
+      log "@file_path: #{@file_path}"
+      save_file
 
       file_checker = FileChecker.new(@file_path)
       file_checker.check_file_path
@@ -87,27 +93,24 @@ class PropertySynthesizeDealloc
       end
     end
 
-    def file_path_supplied?
-      if !@file_path
-        dialog "You have not supplied a file path"
-        exit!
+    def set_file_path
+      docs = @xcode.source_documents.get
+      docs.each do |doc|
+        start_sel, end_sel = doc.selected_character_range.get
+        if end_sel > 0
+          @file_path = doc.path.get
+          return
+        end
       end
+      log "FilePath: #{@file_path}"
     end
 
-    def save_current_file
-      @xcode.text_documents[1].save
-    end
-
-    def find_and_save_file(file_path=@file_path)
-      docs = @xcode.text_documents.get
-      docs.each do |doc|
-        path = doc.get.file_name.get
-        if file_path == path
-          doc.save
-          return doc
-        else
-          false
-        end
+    def save_file(path=nil)
+      if path.nil?
+        doc = @xcode.source_documents[1].get
+      else
+        doc = @xcode.source_documents[its.path.eq(path)].get.first
       end
+      doc.save ? doc : false
     end
 end

data/property_synthesize_dealloc.gemspec

@@ -0,0 +1,82 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{property_synthesize_dealloc}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Craig Williams"]
+  s.date = %q{2011-03-19}
+  s.description = %q{Creates property, synthesize and dealloc statements from selected ivar declarations for the header and implementation files in an Xcode project.}
+  s.email = %q{cwilliams.allancraig@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/config.yml",
+    "lib/configuration.rb",
+    "lib/content_replacer.rb",
+    "lib/converter.rb",
+    "lib/file_checker.rb",
+    "lib/property_synthesize_dealloc.rb",
+    "pkg/property_synthesize_dealloc-0.1.0.gem",
+    "pkg/property_synthesize_dealloc-0.1.1.gem",
+    "pkg/property_synthesize_dealloc-0.1.2.gem",
+    "pkg/property_synthesize_dealloc-0.2.0.gem",
+    "property_synthesize_dealloc.gemspec",
+    "spec/property_synthesize_dealloc_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/test_config.yml"
+  ]
+  s.homepage = %q{http://github.com/CraigWilliams/property_synthesize_dealloc}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.3}
+  s.summary = %q{Creates property, synthesize and dealloc statements from selected ivar declarations}
+  s.test_files = [
+    "spec/property_synthesize_dealloc_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rb-appscript>, [">= 0.6.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<rb-appscript>, [">= 0.6.0"])
+    else
+      s.add_dependency(%q<rb-appscript>, [">= 0.6.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rb-appscript>, [">= 0.6.0"])
+    end
+  else
+    s.add_dependency(%q<rb-appscript>, [">= 0.6.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rb-appscript>, [">= 0.6.0"])
+  end
+end
+

data/spec/property_synthesize_dealloc_spec.rb

@@ -29,16 +29,6 @@ describe "PropertySynthesizeDealloc" do
       p.file_path = path
       p.file_path.should == path
     end
-
-    it "should exit if no file path provided" do
-      pending "stubbing a dialog not working" do
-        dialog = mock('dialog').as_null_object
-        OSAX.osax.stub!(:display_dialog).with('"You have not supplied a file path", ({:buttons=>["Ok"], :default_button=>1}').and_return(dialog)
-
-        p.selection = "NSString *string"
-        p.psd!.should == dialog
-      end
-    end
     
     it "should exit if nothing is selected" do
       pending "stubbing a dialog not working" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_synthesize_dealloc
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Craig Williams
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -07:00
+date: 2011-03-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rb-appscript
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +32,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+  name: rb-appscript
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rspec
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: yard
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: bundler
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: jeweler
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id006
+  name: rcov
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rb-appscript
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,9 +118,8 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  prerelease: false
-  type: :runtime
-  requirement: *id007
+  name: rb-appscript
+  version_requirements: *id007
 description: Creates property, synthesize and dealloc statements from selected ivar declarations for the header and implementation files in an Xcode project.
 email: cwilliams.allancraig@gmail.com
 executables: []
@@ -145,6 +145,9 @@ files:
 - lib/property_synthesize_dealloc.rb
 - pkg/property_synthesize_dealloc-0.1.0.gem
 - pkg/property_synthesize_dealloc-0.1.1.gem
+- pkg/property_synthesize_dealloc-0.1.2.gem
+- pkg/property_synthesize_dealloc-0.2.0.gem
+- property_synthesize_dealloc.gemspec
 - spec/property_synthesize_dealloc_spec.rb
 - spec/spec_helper.rb
 - spec/test_config.yml
@@ -178,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Creates property, synthesize and dealloc statements from selected ivar declarations