netzke_config 0.1.3 → 0.2.0

data/README.markdown

@@ -22,13 +22,13 @@ Must be run frokm the root of a Rails 3 Netzke application.
 
 <code>$ netzke_config</code>
 
-Clones *netzke* modules from 'skozlov' github account in <code>~/netzke/modules</code>.
+Clones *netzke* modules from 'skozlov' github account in <code>~/netzke/plugin-modules</code>.
 
 +Clone modules from specific github account+
 
 <code>$ netzke_config --account kmandrup</code>
 
-Clones *netzke* modules from 'kmandrup' github account in <code>~/netzke/modules</code>.
+Clones *netzke* modules from 'kmandrup' github account in <code>~/netzke/plugin-modules</code>.
 
 +Specify location of netzke modules+
 
@@ -52,6 +52,26 @@ Retrieves and places *netzke* modules in <code>../my/place</code>.
 
 <code>$ netzke_config --modules neztke_ar:master@skozlov,netzke_core:rails3@kmandrup</code>
 
++Using config file for default modules specifications+
+     
+*~/netzke/modules.config* (default config file)
+<pre>
+netzke_core:rails3@kmandrup
+</pre>
+
+<code>$ netzke_config --modules neztke_ar:master@skozlov</code>
+
++Specifying custom config file for default modules specifications+
+     
+*~/configurations/modules.config* (default config file)
+<pre>
+netzke-core:rails3@kmandrup, neztke-basepack:rails3@skozlov 
+</pre>
+
+Modules specs in the modules option always override those found in the config file
+
+<code>$ netzke_config --modules neztke_ar:master@skozlov,neztke-basepack:rails3@kmandrup --config-file ~/configurations/modules.config</code>
+
 ## Copyright ##
 
 Copyright (c) 2009 Kristian Mandrup

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/netzke_config.rb

@@ -2,6 +2,12 @@ require 'active_support/inflector'
 require 'thor'
 require 'thor/group'
 
+class NilClass
+  def empty?
+    true
+  end
+end
+
 class NetzkeConfig < Thor::Group
   include Thor::Actions
 
@@ -9,10 +15,10 @@ class NetzkeConfig < Thor::Group
   # group :netzke
 
   # Define arguments 
-  argument :location, :type => :string, :default => '~/netzke/modules', :desc => 'location where netzke modules are stored' 
+  argument :location, :type => :string, :default => '~/netzke/plugin-modules', :desc => 'Location where netzke modules are to be stored (locally)' 
   # argument :my_arg_name, :type (:string, :hash, :array, :numeric), :default, :required, :optional, :desc, :banner
 
-  class_option :extjs, :type => :string, :default => nil, :desc => 'location of ExtJS 3.x.x library'
+  class_option :extjs, :type => :string, :default => nil, :desc => 'Location of ExtJS 3.x.x library'
 
   class_option :branch, :type => :string, :default => 'rails3', :desc => 'Branch to use for netzke modules'
   class_option :account, :type => :string, :default => 'skozlov', :desc => 'Github account to get Netzke plugins from'
@@ -21,13 +27,13 @@ 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'
+  class_option :modules, :type => :string, :desc => 'Module specifications for each module, fx neztke_ar:master@skozlov,netzke_core:rails3@kmandrup'
+  class_option :config_file, :default => '~/netzke/modules.config', :type => :string, :desc => 'Location of config file for default module specifications' 
 
   GITHUB = 'http://github.com'
 
   def main  
+    load_config_file
     setup_defaults
     define_modules
     exit(-1) if !valid_context?
@@ -36,33 +42,56 @@ class NetzkeConfig < Thor::Group
   end   
 
   protected
-  attr_accessor :modules_config
-
-  def default_modules 
-    ["netzke-core", "netzke-basepack"]    
+  attr_accessor :modules_config, :module_specifications, :default_module_specs
+
+  def load_config_file     
+    @default_module_specs = ""
+    config_file = options[:config_file] 
+    config_file.gsub! /^~/, ENV['HOME']
+    if File.exists?(config_file)
+      @default_module_specs = File.open(config_file).read 
+    else
+      say "module config file at #{config_file} not found"
+    end
   end
 
   def setup_defaults       
-    @modules_config ||= {}
-    default_modules.each do |module_name|
-      set_module_config 'netzke-basepack'
-      set_module_config 'netzke-core' 
-    end
+    @modules_config ||= {} 
+    puts "default_module_specs: '#{default_module_specs}'"
+    all_modules = []         
+    all_modules << default_module_specs if !default_module_specs.empty?
+    all_modules << options[:modules] if options[:modules]
+    puts "all modules: #{all_modules}"
+    @module_specifications = all_modules.join(',') || ""
   end
 
   def define_modules
     @modules_config ||= {}
-    return if !options[:modules]
-    module_defs = options[:modules].split(",")
+    return if module_specifications.empty?
     
+    puts "module_specifications: #{module_specifications}"
+    module_defs = module_specifications.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
+      module_spec = module_spec.strip
+      if module_spec && !module_spec.empty?
+        spec = module_spec.strip.split(":")
+        module_name = spec[0]
+        if spec[1]
+          branch, account = spec[1].split("@")            
+        else
+          branch, account = spec[0].split("@") if spec[0]
+          branch, account = "", "" if !spec[0]
+        end
+        set_module_config module_name.to_sym, :branch => branch, :account => account
+      end
     end
   end
 
+  def default_modules 
+    return [] if default_module_specs && !default_module_specs.strip.empty?
+    ["netzke-core", "netzke-basepack"]    
+  end
+
   def set_module_config name, module_options = {}
     mconfig = modules_config[name.to_sym] = {}
     mconfig[:branch]  = module_options[:branch] || options[:branch]
@@ -74,12 +103,11 @@ class NetzkeConfig < Thor::Group
   end
   
   def valid_context?
-    if netzke_app? && rails3_app?
-      true
-    else
-      say "Must be run from a Netzke rails3 application root directory", :red      
-      false
-    end
+    if !rails3_app?
+      say "Must be run from a rails 3 application root directory", :red      
+      return false
+    end      
+    true
   end
 
   def get_module_names
@@ -115,8 +143,9 @@ class NetzkeConfig < Thor::Group
 
   def update_module module_name 
     config = module_config(module_name)          
-    inside module_name do 
-      branch = config[:branch]
+    return if !config
+    inside module_name do      
+      branch = config[:branch] 
       run "git checkout #{branch}"
       run "git rebase origin/#{branch}" 
       run "git pull" 
@@ -126,8 +155,9 @@ class NetzkeConfig < Thor::Group
   def create_module module_name
     # create dir for module by cloning  
     config = module_config(module_name)    
+    return if !config    
     account = config[:account]    
-    run "git clone #{netzke_github account}/#{module_name}.git #{module_name}" 
+    run "git clone #{github account}/#{module_name}.git #{module_name}" 
     inside module_name do   
       branch = config[:branch]      
       run "git checkout #{branch}"
@@ -188,14 +218,10 @@ class NetzkeConfig < Thor::Group
     File.join(extjs_dir, extjs)
   end
 
-  def netzke_github account
+  def github account
     "#{GITHUB}/#{account}"
   end  
 
-  def netzke_app?
-    File.directory? 'lib/netzke'
-  end
-
   def rails3_app?
     File.exist? 'Gemfile'
   end

data/netzke_config.gemspec

@@ -0,0 +1,60 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{netzke_config}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kristian Mandrup"]
+  s.date = %q{2010-06-22}
+  s.description = %q{Configure Netzke modules as plugins for a Netzke app and link ExtJS library to boot}
+  s.email = %q{kmandrup@gmail.com}
+  s.executables = ["netzke_config", "netzke_config.bat"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "bin/netzke_config",
+     "bin/netzke_config.bat",
+     "lib/netzke_config.rb",
+     "lib/netzke_config.thor",
+     "netzke_config.gemspec",
+     "spec/netzke_config_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "wiki/home.textile"
+  ]
+  s.homepage = %q{http://github.com/kristianmandrup/netzke_config}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Configure a Netzke app for Netzke development and debuging}
+  s.test_files = [
+    "spec/netzke_config_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -53,6 +53,7 @@ files:
 - bin/netzke_config.bat
 - lib/netzke_config.rb
 - lib/netzke_config.thor
+- netzke_config.gemspec
 - spec/netzke_config_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb