submodule 0.0.3 → 0.1.0

data/lib/submodule.rb

@@ -5,10 +5,10 @@ require "inifile"
 
 module Submodule
   class Task < ::Rake::TaskLib
-
     attr_reader :path
+    attr_accessor :branch
 
-    def initialize
+    def initialize 
       @cwd = Dir.pwd
 
       base = File.basename Dir["*.gemspec"][0], ".gemspec"
@@ -19,17 +19,29 @@ module Submodule
 
       gitmodules = IniFile.new('./.gitmodules').to_h
       @path = gitmodules[gitmodules.keys.first]["path"]
+      @path = File.expand_path(@path, @cwd)
       @submodule_name = gitmodules.keys.first.gsub('submodule ', '').gsub('"', '').gsub('vendor/', '')
       @github = gitmodules[gitmodules.keys.first]["url"].gsub('https://github.com/', '').gsub('.git', '')
-      define
-    end
 
-    def test
-      p "define tests in test function"
+      # TODO: detect default branch
+      @branch = "master"
+
+      yield self if block_given?
+      define
     end
 
-    def after_pull
-      p "after pull"
+    [:test, :after_pull].each do |method|
+      define_method method do |&block|
+        instance_variable_set("@#{method}", block)
+      end
+      define_method "run_#{method}" do
+        callback = instance_variable_get("@#{method}")
+        if callback.respond_to?(:call)
+          callback.call
+        else
+          warn "define #{method}"
+        end
+      end
     end
 
     private
@@ -45,18 +57,18 @@ module Submodule
         if hash_before == hash_after
           abort "submodule #{@submodule_name} already up-to-date"
         end
-        test
+        run_test
         update_version hash_after
         cd @cwd
         git_add
-        after_pull
+        run_after_pull
         git_commit hash_after
       end
       desc "Test submodule #{@submodule_name}"
       task "submodule:test" do
         git_update
         cd path
-        test
+        run_test
         cd @cwd
       end
       self
@@ -77,7 +89,7 @@ module Submodule
 
     def git_pull
       sh "git clean -f"
-      sh "git checkout master"
+      sh "git checkout #{branch}"
       sh "git pull"
       # res = my_sh "git pull"
       # if res =~ /Already up-to-date/

data/lib/submodule/version.rb

@@ -1,3 +1,3 @@
 module Submodule
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,58 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: submodule
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - stereobooster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-07 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &27841152 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: inifile
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *27841152
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: &27840900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Small gem to simplify building process of gems with git submodules. Tended to be used for ruby gems which wrap js libraries or another assets
-email: 
+  prerelease: false
+  version_requirements: *27840900
+description: Small gem to simplify building process of gems with git submodules. Tended
+  to be used for ruby gems which wrap js libraries or another assets
+email:
 - stereobooster@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -60,37 +48,34 @@ files:
 - lib/submodule.rb
 - lib/submodule/version.rb
 - submodule.gemspec
-has_rdoc: true
 homepage: https://github.com/stereobooster/submodule
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -511528945
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -511528945
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Small gem to simplify building process of gems with git submodules
 test_files: []
-