appjam 0.1.8.pre13 → 0.1.8

data/lib/appjam.rb

@@ -57,6 +57,6 @@ end # Appjam
 ##
 # We add our generators to Appjam::Genererator
 #
-Appjam::Generators.load_paths << Dir[File.dirname(__FILE__) + '/appjam/generators/{project,model,submodule,gist,search}.rb']
+Appjam::Generators.load_paths << Dir[File.dirname(__FILE__) + '/appjam/generators/{project,model,lib,gist,search}.rb']
 
 

data/lib/appjam/generators/cli.rb

@@ -44,39 +44,37 @@ module Appjam
         else
           puts colorize("Usage: appjam [OPTIONS] [ARGS]")
           puts
-          puts colorize("Project Options")
+          puts colorize("Generator Options")
           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"}
                  ] 
           View.render(opt, RENDER_OPTIONS)
-          puts
-          puts colorize("Submodule Options")
-          puts          
-          opt = [
-           { :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 
-          puts colorize("Gist Options")
+          puts colorize("Appjam Options")
           require 'yaml'
-          begin
-            page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
-          rescue SocketError => e
-          end   
+          gistfile = File.expand_path("~") + '/.appjam/gist.yml'
+          Gist::update_gist unless File.exist?(gistfile)          
           begin 
-            g = YAML::load(page_source)  
+            g = YAML.load_file(gistfile)  
           rescue ArgumentError => e
             g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
           end
           g.each_pair {|key,value|
             gitopt = []   
+            gname = key.gsub('_',' ')
             puts 
-            puts colorize("Gist Category [#{key.gsub('_',' ')}]")            
+            if gname == 'lib'
+              puts colorize("Framework Lib")   
+            else
+              puts colorize("Gist Category [#{gname}]")  
+            end         
             g[key].each { |k|
               k.each_pair { |k1,v1|
-                gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam gist #{k1}",   :description => "#{k[k1][2]['description']}" }
+                if gname == 'lib'
+                  gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam lib #{k1}",   :description => "#{k[k1][2]['description']}" }
+                else
+                  gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam gist #{k1}",   :description => "#{k[k1][2]['description']}" }
+                end
               }
             }
             View.render(gitopt, RENDER_OPTIONS) 

data/lib/appjam/generators/gist.rb

@@ -49,6 +49,21 @@ module Appjam
           end          
         end  
         
+        def update_gist
+          appjam_dir = '~/.appjam'
+          appjam_gist = File.expand_path("~") + '/.appjam/gist.yml'
+          system "mkdir -p #{appjam_dir}" unless File.exist?(appjam_dir)
+          begin
+            puts "fetching new gist list from server ... "
+            page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
+            File.open(appjam_gist, 'w') {|f| f.write(page_source) }
+          rescue SocketError => e
+            puts "can not access github.com, back to local version gist.yml"
+            origin_gist = File.expand_path(File.dirname(__FILE__) + '/gist.yml')
+            system "cp #{origin_gist} #{appjam_gist}"
+          end      
+        end
+        
         def download_gists(username, page=1)
           puts "-- Downloading page #{page} of gists --"
           url = URI.parse("http://gist.github.com")
@@ -92,10 +107,6 @@ module Appjam
         end                 
       end
       
-      gist_name "singleton"
-      gist_id "https://gist.github.com/979981"
-      gist_description "Singletons in Objective C"
-      
       # Add this generator to our appjam
       Appjam::Generators.add_generator(:gist, self)
 
@@ -128,39 +139,47 @@ module Appjam
           @created_on = Date.today.to_s
           self.destination_root = options[:root]
           
-          require 'yaml'
-          begin
-            page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
-          rescue SocketError => e
-            puts "can not access github.com, back to local version gist.yml"
-          end   
-          begin 
-            puts "fetching new gists ..." 
-            g = YAML::load(page_source)  
-          rescue ArgumentError => e
-            puts "can't fetch new gists, loading local gists ..."
-            g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
-          end
-          g.each_pair {|key,value|
-            gcategory = key.downcase
-            g[key].each { |k|
-              k.each_pair { |k1,v1|
-                if "#{k1}" == @gist_name
-                  gid = k[k1][0]['id']
-                  gname = k[k1][1]['name']
-                  Gist::download_gist("#{gid}",gcategory,gname)
-                  eval(File.read(__FILE__) =~ /^__END__/ && $' || '')
-                  say "================================================================="
-                  say "Your '#{gname.capitalize}' snippet code has been generated."
-                  say "Check Gist/#{gcategory}/#{gname}/ for snippet"
-                  say "Open #{@xcode_project_name.capitalize}.xcodeproj"
-                  say "Add 'Gist/#{gcategory}/#{gname}/' folder to the 'Classes/apps' Group"
-                  say "Build and Run"          
-                  say "================================================================="              
-                end                  
-              }
+          unless @gist_name == 'update'
+            require 'yaml'
+            # begin
+            #   page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
+            # rescue SocketError => e
+            #   puts "can not access github.com, back to local version gist.yml"
+            # end   
+            gistfile = File.expand_path("~") + '/.appjam/gist.yml'
+            Gist::update_gist unless File.exist?(gistfile)
+            begin 
+              puts "fetching new gists ..." 
+              g = YAML.load_file(gistfile)  
+            rescue ArgumentError => e
+              puts "can't fetch new gists, loading local gists ..."
+              g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
+            end
+            g.each_pair {|key,value|
+              gcategory = key.downcase
+              unless gcategory == 'lib'
+                g[key].each { |k|
+                  k.each_pair { |k1,v1|
+                    if "#{k1}" == @gist_name
+                      gid = k[k1][0]['id']
+                      gname = k[k1][1]['name']
+                      Gist::download_gist("#{gid}",gcategory,gname)
+                      eval(File.read(__FILE__) =~ /^__END__/ && $' || '')
+                      say "================================================================="
+                      say "Your '#{gname.capitalize}' snippet code has been generated."
+                      say "Check Gist/#{gcategory}/#{gname}/ for snippet"
+                      say "Open #{@xcode_project_name.capitalize}.xcodeproj"
+                      say "Add 'Gist/#{gcategory}/#{gname}/' folder to the 'Classes/apps' Group"
+                      say "Build and Run"          
+                      say "================================================================="              
+                    end                  
+                  }
+                }
+              end
             }
-          }
+          else
+            Gist::update_gist
+          end
         else 
           puts
           puts '-'*70
@@ -168,7 +187,7 @@ module Appjam
           puts '-'*70
           puts
         end
-      end
+      end # create_gist
 
     end # Gist
   end # Generators

data/lib/appjam/generators/gist.yml

@@ -11,13 +11,63 @@ design_pattern:
 - injection:
   - id : 986087
   - name : Injection
-  - description : Ruby's injection method for Objective C
+  - description : Ruby's injection method for Objective C 
   
 algorithm:
 - binary_search:
   - id : 988219
   - name : Binary_Search
   - description : A binary search algorithm written Objective C
+
+lib:
+- three20: 
+  - id : git://github.com/facebook/three20.git
+  - name : Three20
+  - description : three20 frameworks   
+- asi: 
+  - id : git://github.com/pokeb/asi-http-request.git
+  - name : AsiHttpRequest
+  - description : asi http request frameworks  
+- json: 
+  - id : git://github.com/stig/json-framework
+  - name : JsonFramework
+  - description : json framework 
+- facebook: 
+  - id : git://github.com/facebook/facebook-ios-sdk.git
+  - name : FacebookIOSSdk
+  - description : facebook-ios-sdk framework  
+- yajl: 
+  - id : git://github.com/gabriel/yajl-objc.git
+  - name : YAJLFramework
+  - description : YAJL Framework 
+- oauth: 
+  - id : git://github.com/jdg/oauthconsumer.git
+  - name : OauthConsumer
+  - description : oauth consumer 
+- fmdb: 
+  - id : git://github.com/ccgus/fmdb.git
+  - name : fmdb
+  - description : A Cocoa / Objective-C wrapper around
+- touchxml: 
+  - id : git://github.com/TouchCode/TouchXML.git
+  - name : TouchXML
+  - description : TouchXML Framework 
+- touchjson: 
+  - id : git://github.com/TouchCode/TouchJSON.git
+  - name : TouchJSON
+  - description : TouchJSON Framework  
+- kissxml: 
+  - id : https://kissxml.googlecode.com/hg/
+  - name : KissXML
+  - description : KissXML Framework  
+- cocos2d: 
+  - id : git://github.com/cocos2d/cocos2d-iphone.git
+  - name : Cocos2dIphone
+  - description : Cocos2d iPhone Framework  
+- sparrow: 
+  - id : git://github.com/PrimaryFeather/Sparrow-Framework.git
+  - name : SparrowFramework
+  - description : Sparrow Framework for iPhone
         
 utiliy_function:
 - get_ip_address: 
@@ -74,9 +124,9 @@ snippet:
   - id : 990090
   - name : Get_Random_Number_In_A_Range
   - description : Get random number in Objective C
-- mailComposeViewController_usage:
+- mail_usage:
   - id : 990122
-  - name : MFMailComposeViewController_Usage
+  - name : mail_usage
   - description : MFMailComposeViewController with availability check  
 - nsstring_md5:  
   - id : 990141

data/lib/appjam/generators/lib.rb

@@ -0,0 +1,193 @@
+require 'rubygems'
+require 'fileutils'
+require 'net/http'
+require 'net/https'
+require 'uri'
+require "open-uri"
+require 'tempfile'
+require File.dirname(__FILE__) + '/jam'
+require File.dirname(__FILE__) + '/gist'
+
+module Appjam
+  module Generators
+    class Lib < Jam
+      
+      class << self
+        def self.attr_rw(*attrs)
+          attrs.each do |attr|
+            class_eval %Q{
+              def #{attr}(val=nil)
+                val.nil? ? @#{attr} : @#{attr} = val
+              end
+            }
+          end
+        end        
+        attr_rw :gist_name, :gist_description, :gist_id, :gist_body   
+        def preview_gist(gid)
+          uri  = URI("https://gist.github.com/#{gid}.txt")
+          http = Net::HTTP.new(uri.host, uri.port)
+          if uri.scheme == 'https'
+            http.use_ssl     = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
+          result   = http.start {|h| h.request(Net::HTTP::Get.new(uri.path))}
+          tempfile = Tempfile.new('gist')
+          tempfile.puts(result)
+          tempfile.close
+
+          if system('which qlmanage')
+            system("qlmanage -p #{tempfile.path} >& /dev/null")
+          end          
+        end  
+        
+        def download_gists(username, page=1)
+          puts "-- Downloading page #{page} of gists --"
+          url = URI.parse("http://gist.github.com")
+          res = Net::HTTP.start(url.host, url.port) do |http|
+              response = http.get("/#{username}?page=#{page}")
+              if response.code == '200'
+                links = get_links(response.body)
+                links.each do |link, gist_id|
+                  puts "git://gist.github.com/#{gist_id}.git"
+                  if File.directory?("Gist/#{gist_id}")
+                    `cd Gist/#{gist_id} && git pull ; cd ..`
+                  else
+                    `git clone git://gist.github.com/#{gist_id}.git Gist/#{gist_id}`
+                  end
+                end
+                download_gists(username, page+1) unless links.empty?
+              end
+          end
+        end     
+        
+        def download_gist(gist_id,git_category,gist_name)
+          puts "-- fetching [#{gist_name}] lib --"
+          # require 'uri'
+          # require 'yajl/http_stream'
+          # 
+          # uri = URI.parse("http://gist.github.com/api/v1/json/#{gist_id}")
+          # Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
+          #   
+          # end    
+          #     if @submodule_name == 'kissxml'
+          #       eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')  
+          # 
+          #       system "rm -rf kissxml"
+          #       system "hg clone https://kissxml.googlecode.com/hg/ Frameworks/kissxml"
+          #       system "git add ."
+          #       system "git commit -m 'import kissxml submodule'"
+          #       say (<<-TEXT).gsub(/ {10}/,'')      
+          if gist_id.include?('github.com')               
+            if File.directory?("Frameworks/#{gist_name.downcase}")
+              `rm -rf Frameworks/#{gist_name.downcase}`
+            end
+            if("#{gist_id}".is_numeric?)
+              `git clone git://gist.github.com/#{gist_id}.git Frameworks/#{gist_name.downcase} && rm -rf Frameworks/#{gist_name.downcase}/.git`
+            else
+              `git clone #{gist_id} Frameworks/#{gist_name.downcase} && rm -rf Frameworks/#{gist_name.downcase}/.git`
+            end
+          else
+            if system('which hg') != nil
+               system "rm -rf Frameworks/#{gist_name.downcase}"
+               system "hg clone https://kissxml.googlecode.com/hg/ Frameworks/#{gist_name.downcase}"
+               system "git add ."
+               system "git commit -m 'import #{gist_name.downcase} submodule'"     
+            else
+               say "="*70
+               say "Mercurial was not installed!! check http://mercurial.selenic.com/ for installation."
+               say "="*70              
+            end       
+          end
+        end                 
+      end      
+
+      # Add this generator to our appjam
+      Appjam::Generators.add_generator(:lib, self)
+
+      # Define the source lib root
+      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
+      def self.banner; "appjam lib [name]"; end
+
+      # Include related modules
+      include Thor::Actions
+      include Appjam::Generators::Actions            
+
+      desc "Description:\n\n\tappjam will generates an new PureMvc Model for iphone"
+
+      argument :name, :desc => "The name of your lib"
+
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
+      class_option :destroy, :aliases => '-d', :default => false,   :type    => :boolean
+
+      def in_app_root?
+        File.exist?('Classes')
+      end     
+
+      def create_lib
+        if in_app_root? 
+          valid_constant?(options[:lib] || name)
+          @lib_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]
+
+          require 'yaml'
+          # begin
+          #   page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
+          # rescue SocketError => e
+          # end   
+          gistfile = File.expand_path("~") + '/.appjam/gist.yml'
+          Gist::update_gist unless File.exist?(gistfile)          
+          begin 
+            g = YAML.load_file(gistfile)  
+          rescue ArgumentError => e
+            g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
+          end
+          g.each_pair {|key,value|
+            gcategory = key.downcase
+            if gcategory == 'lib'
+              g[key].each { |k|
+                k.each_pair { |k1,v1|
+                  if "#{k1}" == @lib_name
+                    gid = k[k1][0]['id']
+                    gname = k[k1][1]['name']
+                    eval(File.read(__FILE__) =~ /^__END__\n/ && $' || '')                       
+                    Lib::download_gist("#{gid}",gcategory,gname)
+                    eval(File.read(__FILE__) =~ /^__END__/ && $' || '')
+                    say "================================================================="
+                    say "Check Frameworks/#{gcategory}/#{gname}/ for lib"
+                    say "Open #{@xcode_project_name.capitalize}.xcodeproj"
+                    say "Add 'Frameworks/#{gcategory}/#{gname}/' folder to the 'Classes' Group"
+                    say "Build and Run"          
+                    say "================================================================="              
+                  end                  
+                }
+              }
+            end
+          }
+        else 
+          puts
+          puts '-'*70
+          puts "You are not in an iphone project folder"
+          puts '-'*70
+          puts
+        end        
+      end
+
+    end # Submodule
+  end # Generators
+end # Appjam
+
+__END__
+unless File.exist?("./.git")
+system "git init"
+template "lib/gitignore.tt", "./.gitignore"
+template "lib/gitattributes.tt", "./.gitattributes"
+system "git add ."
+system "git commit -m 'init commit'"
+end
+
+

data/lib/appjam/generators/{submodule → lib}/gitignore.tt

@@ -2,7 +2,7 @@
 .DS_Store
 profile
 xcuserdata
-Gist
+Gist/*
 
 # Textmate - if you build your xcode projects with it
 *.tm_build_errors

data/lib/appjam/generators/project.rb

@@ -72,6 +72,8 @@ empty_directory "#{@project_name}/Classes/utils"
 
 empty_directory "#{@project_name}/Gist"
 
+empty_directory "#{@project_name}/Frameworks"
+
 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/search.rb

@@ -46,24 +46,37 @@ module Appjam
         puts colorize("Available Options contains [#{@gist_name}]")
         puts
         require 'yaml'
-        begin
-          page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
-        rescue SocketError => e
-        end   
+        # begin
+        #   page_source = Net::HTTP.get(URI.parse("http://eiffelqiu.github.com/appjam/gist.yml"))
+        # rescue SocketError => e
+        # end   
+        # begin 
+        #   g = YAML::load(page_source)  
+        # rescue ArgumentError => e
+        #   g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
+        # end
+        gistfile = File.expand_path("~") + '/.appjam/gist.yml'
+        Gist::update_gist unless File.exist?(gistfile)          
         begin 
-          g = YAML::load(page_source)  
+          g = YAML.load_file(gistfile)  
         rescue ArgumentError => e
           g = YAML.load_file(File.expand_path(File.dirname(__FILE__) + '/gist.yml'))
-        end
+        end        
         gitopt = []  
         g.each_pair {|key,value|
-          # puts colorize("Gist Category [#{key.gsub('_',' ')}]")            
+          # puts colorize("Gist Category [#{key.gsub('_',' ')}]")    
+          gname = key.gsub('_',' ')        
           g[key].each { |k|
             k.each_pair { |k1,v1|
               gist_name = k1.downcase
               gist_desc = k[k1][2]['description'].downcase
               if gist_name.include?(@gist_name) or gist_desc.include?(@gist_name)
-                gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam gist #{k1}",   :description => "#{k[k1][2]['description']}" }
+                # gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam gist #{k1}",   :description => "#{k[k1][2]['description']}" }
+                if gname == 'lib'
+                  gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam lib #{k1}",   :description => "#{k[k1][2]['description']}" }
+                else
+                  gitopt << {:category => "#{key.gsub('_',' ')}", :command => "appjam gist #{k1}",   :description => "#{k[k1][2]['description']}" }
+                end              
               end
             }
           }

data/lib/appjam/version.rb

@@ -3,7 +3,7 @@ module Appjam
     MAJOR = 0
     MINOR = 1
     PATCH = 8
-    BUILD = 'pre13'
+    BUILD = ''
     
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').chomp('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appjam
 version: !ruby/object:Gem::Version 
-  hash: 1923832035
-  prerelease: 6
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 1
   - 8
-  - pre
-  - 13
-  version: 0.1.8.pre13
+  version: 0.1.8
 platform: ruby
 authors: 
 - Eiffel Q
@@ -17,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +08:00
-default_executable: appjam
+date: 2011-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -31,8 +28,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: thor
   version_requirements: *id001
+  name: thor
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -45,8 +42,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: activesupport
   version_requirements: *id002
+  name: activesupport
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -59,8 +56,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: cli-colorize
   version_requirements: *id003
+  name: cli-colorize
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -73,26 +70,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: hirb
   version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yajl-ruby
-  version_requirements: *id005
+  name: hirb
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +86,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  version_requirements: *id005
   name: rake
-  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +102,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  version_requirements: *id006
   name: mocha
-  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +118,12 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
+  version_requirements: *id007
   name: rack-test
-  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +134,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
+  version_requirements: *id008
   name: fakeweb
-  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -167,12 +150,12 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
+  version_requirements: *id009
   name: webrat
-  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,12 +166,12 @@ dependencies:
         - 10
         - 3
         version: 2.10.3
+  version_requirements: *id010
   name: shoulda
-  version_requirements: *id011
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -199,12 +182,12 @@ dependencies:
         - 3
         - 1
         version: 2.3.1
+  version_requirements: *id011
   name: uuid
-  version_requirements: *id012
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -215,12 +198,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
+  version_requirements: *id012
   name: builder
-  version_requirements: *id013
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -231,12 +214,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  version_requirements: *id013
   name: jeweler
-  version_requirements: *id014
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -247,8 +230,22 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  version_requirements: *id014
   name: rcov
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   version_requirements: *id015
+  name: grit
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -261,8 +258,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: grit
   version_requirements: *id016
+  name: i18n
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -275,8 +272,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: i18n
   version_requirements: *id017
+  name: rdoc
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -289,8 +286,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
   version_requirements: *id018
+  name: yajl-ruby
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -305,8 +302,8 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  name: ruby-prof
   version_requirements: *id019
+  name: ruby-prof
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -320,8 +317,8 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: system_timer
   version_requirements: *id020
+  name: system_timer
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -334,8 +331,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: activesupport
   version_requirements: *id021
+  name: activesupport
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -348,8 +345,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: grit
   version_requirements: *id022
+  name: grit
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -362,8 +359,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: i18n
   version_requirements: *id023
+  name: i18n
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -376,8 +373,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: hirb
   version_requirements: *id024
+  name: hirb
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -390,8 +387,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: cli-colorize
   version_requirements: *id025
+  name: cli-colorize
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -404,22 +401,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
   version_requirements: *id026
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id027 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yajl-ruby
-  version_requirements: *id027
+  name: rdoc
   prerelease: false
 description: generate iphone app skeleton based on pure mvc framework
 email: eiffelqiu@gmail.com
@@ -438,6 +421,10 @@ files:
 - lib/appjam/generators/gist.rb
 - lib/appjam/generators/gist.yml
 - lib/appjam/generators/jam.rb
+- lib/appjam/generators/lib.rb
+- lib/appjam/generators/lib/gitattributes.tt
+- lib/appjam/generators/lib/gitignore.tt
+- lib/appjam/generators/lib/gitmodules.tt
 - lib/appjam/generators/model.rb
 - lib/appjam/generators/project.rb
 - lib/appjam/generators/project/Classes/ContactsAppDelegate.h.tt
@@ -515,10 +502,6 @@ files:
 - lib/appjam/generators/project/utils/URLEncodeString.h
 - lib/appjam/generators/project/utils/URLEncodeString.m
 - lib/appjam/generators/search.rb
-- lib/appjam/generators/submodule.rb
-- lib/appjam/generators/submodule/gitattributes.tt
-- lib/appjam/generators/submodule/gitignore.tt
-- lib/appjam/generators/submodule/gitmodules.tt
 - lib/appjam/tasks.rb
 - lib/appjam/tasks/plugin.rb
 - lib/appjam/version.rb
@@ -529,7 +512,6 @@ files:
 - test/test_model_generator.rb
 - test/test_project_generator.rb
 - bin/appjam
-has_rdoc: true
 homepage: http://github.com/eiffelqiu/appjam
 licenses: 
 - MIT
@@ -550,18 +532,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: an iphone app generator

data/lib/appjam/generators/submodule.rb

@@ -1,168 +0,0 @@
-require File.dirname(__FILE__) + '/jam'
-
-module Appjam
-  module Generators
-    class Submodule < Jam
-
-      # Add this generator to our appjam
-      Appjam::Generators.add_generator(:submodule, self)
-
-      # Define the source submodule root
-      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
-      def self.banner; "appjam submodule [name]"; end
-
-      # Include related modules
-      include Thor::Actions
-      include Appjam::Generators::Actions            
-
-      desc "Description:\n\n\tappjam will generates an new PureMvc Model for iphone"
-
-      argument :name, :desc => "The name of your puremvc submodule"
-
-      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :destroy, :aliases => '-d', :default => false,   :type    => :boolean
-
-      def in_app_root?
-        File.exist?('Classes')
-      end     
-
-      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? 
-            if @submodule_name == 'three20'
-                
-            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}/,'')
-
-            =================================================================
-            Three20 submodule has been imported
-
-            Open #{@xcode_project_name.capitalize}.xcodeproj
-            Add "three20/src/Three20/Three20.xcodeproj" folder to the "Other Sources" Group
-            Add "three20/src/Three20.bundle" folder to the "Other Sources" Group
-            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
-              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 "Git was not installed!! check http://git-scm.com/ for installation."
-          say "="*70          
-        end
-      end
-
-    end # Submodule
-  end # Generators
-end # Appjam
-
-__END__
-unless File.exist?("./.git")
-system "git init"
-template "submodule/gitignore.tt", "./.gitignore"
-template "submodule/gitattributes.tt", "./.gitattributes"
-system "git add ."
-system "git commit -m 'init commit'"
-end
-
-