appjam 0.1.6 → 0.1.7

data/README.rdoc

@@ -57,6 +57,42 @@ Add "three20/src/Three20.bundle" folder to the "Other Sources" Group
 
 Xcode build and run
 
+==== Usage 4: add asihttp submodule (## this require git installed)
+
+$ cd todo 
+
+$ appjam submodule asihttp 
+
+$ open Todo.xcodeproj
+
+Add "asihttp" folder to the "Other Sources" Group
+
+Xcode build and run
+
+==== Usage 5: add json-framework submodule (## this require git installed)
+
+$ cd todo 
+
+$ appjam submodule json 
+
+$ open Todo.xcodeproj
+
+Add "json-framework" folder to the "Other Sources" Group
+
+Xcode build and run
+
+==== Usage 6: add kissxml submodule (## this require mercurial installed)
+
+$ cd todo 
+
+$ appjam submodule json 
+
+$ open Todo.xcodeproj
+
+Add "kissxml" folder to the "Other Sources" Group
+
+Xcode build and run
+
 == Contributing to appjam
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/appjam/generators/cli.rb

@@ -47,7 +47,11 @@ module Appjam
           puts colorize("APPJAM OPTIONS", { :foreground => :blue})
           opt = [{ :category => "objective c (iphone)", :command => "appjam project todo", :description => "generate iphone project skeleton"},
                  { :category => "objective c (iphone)", :command => "appjam model user",   :description => "generate iphone project data model"},
-                 { :category => "objective c (iphone)", :command => "appjam submodule three20",   :description => "fetch three20 subproject from github.com"}] 
+                 { :category => "objective c (iphone)", :command => "appjam submodule three20",   :description => "fetch three20 subproject from github.com"},
+                 { :category => "objective c (iphone)", :command => "appjam submodule asihttp",   :description => "fetch asi-http-request subproject from github.com"},
+                 { :category => "objective c (iphone)", :command => "appjam submodule json",   :description => "fetch json-framework subproject from github.com"},
+                 { :category => "objective c (iphone)", :command => "appjam submodule kissxml",   :description => "fetch kissxml subproject from code.google.com"}
+                 ] 
           View.render(opt, RENDER_OPTIONS)
           puts
         end

data/lib/appjam/generators/project.rb

@@ -70,6 +70,8 @@ template "project/main.m.tt", "#{@project_name}/main.m"
 
 empty_directory "#{@project_name}/Classes/utils"
 
+empty_directory "#{@project_name}/Support"
+
 copy_file "project/utils/NSStringWhiteSpace.h", "#{@project_name}/Classes/utils/NSStringWhiteSpace.h"
 copy_file "project/utils/NSStringWhiteSpace.m", "#{@project_name}/Classes/utils/NSStringWhiteSpace.m"   
 copy_file "project/utils/UIDevice.h", "#{@project_name}/Classes/utils/UIDevice.h"  

data/lib/appjam/generators/submodule.rb

@@ -26,21 +26,65 @@ module Appjam
         File.exist?('Classes')
       end     
 
-      def create_app
+      def create_submodule
+        valid_constant?(options[:submodule] || name)
+        @submodule_name = (options[:app] || name).gsub(/W/, "_").downcase
+        @xcode_project_name = File.basename(Dir.glob('*.xcodeproj')[0],'.xcodeproj').downcase          
+        @class_name = (options[:app] || name).gsub(/W/, "_").capitalize
+        @developer = "eiffel"
+        @created_on = Date.today.to_s
+        self.destination_root = options[:root]
+        
+        if which('hg') != nil
+          if in_app_root?
+            if @submodule_name == 'kissxml'
+              eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')  
+
+              system "rm -rf kissxml"
+              system "hg clone https://kissxml.googlecode.com/hg/ kissxml"
+              system "git add ."
+              system "git commit -m 'import kissxml submodule'"
+              say (<<-TEXT).gsub(/ {10}/,'')
+
+              =================================================================
+              kissxml submodule has been imported
+
+              Open #{@xcode_project_name.capitalize}.xcodeproj
+              Add "kissxml" folder to the "Other Sources" Group
+              Build and Run
+              =================================================================
+              TEXT
+            else
+              unless %w(three20 sihttp json-framework kissxml).include?(@submodule_name)
+                say "="*70
+                say "Only support three20,asihttp,json-framework,kissxml submodule now!"
+                say "="*70
+              end            
+            end
+          else
+            puts
+            puts '-'*70
+            puts "You are not in an iphone project folder"
+            puts '-'*70
+            puts            
+          end
+        else
+          say "="*70
+          say "Mercurial was not installed!! check http://mercurial.selenic.com/ for installation."
+          say "="*70          
+        end        
+        
         if which('git') != nil
           if in_app_root? 
-            valid_constant?(options[:submodule] || name)
-            @submodule_name = (options[:app] || name).gsub(/W/, "_").downcase
-            @xcode_project_name = File.basename(Dir.glob('*.xcodeproj')[0],'.xcodeproj').downcase          
-            @class_name = (options[:app] || name).gsub(/W/, "_").capitalize
-            @developer = "eiffel"
-            @created_on = Date.today.to_s
-            self.destination_root = options[:root]
-        
             if @submodule_name == 'three20'
                 
-            eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')       
-
+            eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')  
+                 
+            system "rm -rf three20"
+            system "git submodule add git://github.com/facebook/three20.git three20"
+            system "git add ."
+            system "git commit -m 'import three20 submodule'"
+            
             say (<<-TEXT).gsub(/ {10}/,'')
 
             =================================================================
@@ -52,10 +96,47 @@ module Appjam
             Build and Run
             =================================================================
             TEXT
+            elsif @submodule_name == 'asihttp'
+              eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')  
+
+              system "rm -rf asihttp"
+              system "git submodule add git://github.com/pokeb/asi-http-request.git asihttp"
+              system "git add ."
+              system "git commit -m 'import asihttp submodule'"
+
+              say (<<-TEXT).gsub(/ {10}/,'')
+
+              =================================================================
+              Asihttp submodule has been imported
+
+              Open #{@xcode_project_name.capitalize}.xcodeproj
+              Add "asihttp" folder to the "Other Sources" Group
+              Build and Run
+              =================================================================
+              TEXT
+            elsif @submodule_name == 'json'
+              eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')  
+
+              system "rm -rf json-framework"
+              system "git submodule add git://github.com/stig/json-framework json-framework"
+              system "git add ."
+              system "git commit -m 'import json-framework submodule'"      
+              say (<<-TEXT).gsub(/ {10}/,'')
+
+              =================================================================
+              json-framework submodule has been imported
+
+              Open #{@xcode_project_name.capitalize}.xcodeproj
+              Add "json-framework" folder to the "Other Sources" Group
+              Build and Run
+              =================================================================
+              TEXT
             else
-              say "="*70
-              say "Only support three20 submodule now!"
-              say "="*70
+              unless %w(three20 sihttp json-framework kissxml).include?(@submodule_name)
+                say "="*70
+                say "Only support three20,asihttp,json-framework,kissxml submodule now!"
+                say "="*70
+              end
             end
           else
             puts
@@ -82,8 +163,5 @@ template "submodule/gitignore.tt", "./.gitignore"
 system "git add ."
 system "git commit -m 'init commit'"
 end
-system "rm -rf three20"
-system "git submodule add git://github.com/facebook/three20.git three20"
-system "git add ."
-system "git commit -m 'import three20 submodule'"
+
 

data/lib/appjam/generators/submodule/gitignore.tt

@@ -1,2 +1,3 @@
 .DS_Store
-build/
+build
+.hg

data/lib/appjam/version.rb

@@ -2,7 +2,7 @@ module Appjam
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 6
+    PATCH = 7
     BUILD = ''
     
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').chomp('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appjam
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Eiffel Q
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 Z
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime