netzke_config 0.1.2 → 0.1.3

data/README.markdown

@@ -48,6 +48,9 @@ Retrieves and places *netzke* modules in <code>../my/place</code>.
 
 <code>$ netzke_config --overwrite-all --extjs ~/code/ext-3.2.1/ --download</code>
 
++Detailed specifications of each module to include as plugin+
+
+<code>$ netzke_config --modules neztke_ar:master@skozlov,netzke_core:rails3@kmandrup</code>
 
 ## Copyright ##
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/netzke_config.rb

@@ -21,16 +21,58 @@ class NetzkeConfig < Thor::Group
   class_option :ext_version, :type => :string, :default => '3.2.1', :desc => 'ExtJS version to download'
   class_option :download, :type => :boolean, :default => false, :desc => 'Download ExtJS if not found in specified extjs location'
 
+  # class_option :basepack, :type => :string, :desc => 'Github branch and account specification for basepack module, fx rails3@kmandrup'
+  # class_option :core, :type => :string, :desc => 'Github branch and account specification for core module, fx master@skozlov'
+  class_option :modules, :type => :string, :desc => 'module specifications for each module, fx neztke_ar:master@skozlov,netzke_core:rails3@kmandrup'
+
   GITHUB = 'http://github.com'
 
-  def main
+  def main  
+    setup_defaults
+    define_modules
     exit(-1) if !valid_context?
     configure_modules
     configure_extjs if options[:extjs] 
   end   
 
   protected
+  attr_accessor :modules_config
+
+  def default_modules 
+    ["netzke-core", "netzke-basepack"]    
+  end
+
+  def setup_defaults       
+    @modules_config ||= {}
+    default_modules.each do |module_name|
+      set_module_config 'netzke-basepack'
+      set_module_config 'netzke-core' 
+    end
+  end
+
+  def define_modules
+    @modules_config ||= {}
+    return if !options[:modules]
+    module_defs = options[:modules].split(",")
+    
+    module_defs.each do |module_spec|
+      spec = module_spec.strip.split(":")
+      module_name = spec[0] 
+      branch, account = spec[1].split("@")            
+      set_module_config module_name.to_sym, :branch => branch, :account => account
+    end
+  end
+
+  def set_module_config name, module_options = {}
+    mconfig = modules_config[name.to_sym] = {}
+    mconfig[:branch]  = module_options[:branch] || options[:branch]
+    mconfig[:account] = module_options[:account] || options[:account]
+  end
 
+  def module_config name 
+    modules_config[name.to_sym]
+  end
+  
   def valid_context?
     if netzke_app? && rails3_app?
       true
@@ -39,11 +81,15 @@ class NetzkeConfig < Thor::Group
       false
     end
   end
+
+  def get_module_names
+    default_modules | modules_config.keys.map{|k| k.to_s}    
+  end
   
   def configure_modules  
     create_module_container_dir  
     inside "#{location}" do
-      ["netzke-core", "netzke-basepack"].each do |module_name|
+      get_module_names.each do |module_name|
         get_module module_name
         config_netzke_plugin module_name
       end        
@@ -67,8 +113,10 @@ class NetzkeConfig < Thor::Group
     end
   end
 
-  def update_module module_name
-    inside module_name do
+  def update_module module_name 
+    config = module_config(module_name)          
+    inside module_name do 
+      branch = config[:branch]
       run "git checkout #{branch}"
       run "git rebase origin/#{branch}" 
       run "git pull" 
@@ -76,9 +124,12 @@ class NetzkeConfig < Thor::Group
   end
     
   def create_module module_name
-    # create dir for module by cloning
-    run "git clone #{netzke_github}/#{module_name}.git #{module_name}" 
-    inside module_name do
+    # create dir for module by cloning  
+    config = module_config(module_name)    
+    account = config[:account]    
+    run "git clone #{netzke_github account}/#{module_name}.git #{module_name}" 
+    inside module_name do   
+      branch = config[:branch]      
       run "git checkout #{branch}"
     end
   end
@@ -137,8 +188,8 @@ class NetzkeConfig < Thor::Group
     File.join(extjs_dir, extjs)
   end
 
-  def netzke_github
-    "#{GITHUB}/#{options[:account]}"
+  def netzke_github account
+    "#{GITHUB}/#{account}"
   end  
 
   def netzke_app?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kristian Mandrup