gondler 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634edf93cbd25446d48e0b3398c216bc18bb70d0
-  data.tar.gz: 16b89b6eca979a8da0cfaa94087b7e1d9ad168cd
+  metadata.gz: 9a4bbc74994c0cd4aeeba7733ca38b6682e97edb
+  data.tar.gz: dfb30ba73178a52fd6a6f98852db63a641e2074e
 SHA512:
-  metadata.gz: ece921976ddad9d0c5a4838191779b07fbf69bd2e1e28dbc79af443e313329ceeaff132007a34472fd95228a96e914dedc0177bb656c2820e30e9478de15bfce
-  data.tar.gz: 3dcf97bb1520f2bf2051b54835826c7f32ab388adde137cafc5f5ad59f9b203b38b643c2d7c906af3b20eef2503b6e692a477c51165aa6c4a7ae2e18ba6c5ee8
+  metadata.gz: 990993d6c905170bfee5aa5bf7fe32ff146e571effc4090fe3e7a30f7b4a3d1fd60427d94dfd67eb6f571e04b1fed8baa9f7a6f039f865b73781f7accaeea456
+  data.tar.gz: abaa9acd45bd9b22e279fff1045aea87dc95ee42e77617a7c9fa79752c3c81db43c4582256f1075d02c9235196faa2c607521517082530ffb6d9f6ccf0d37362

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rspec'
+  gem 'rspec', '2.14.1'
   gem 'pry'
 end

data/README.md

@@ -24,6 +24,8 @@ bundler for golang. inspired by [gom](https://github.com/mattn/gom).
 like gom's Gomfile
 
 ```ruby
+itself 'github.com/rosylilly/test'
+
 gom 'github.com/golang/glog'
 package 'github.com/golang/glog'
 

data/lib/gondler/cli.rb

@@ -22,6 +22,8 @@ module Gondler
           package.resolve
         end
       end
+
+      gomfile.itself_package.get if gomfile.itself_package
     rescue Gondler::Package::InstallError => e
       puts e.message
       exit(1)

data/lib/gondler/env.rb

@@ -2,6 +2,11 @@ module Gondler
   class Env
     class << self
       def accessor(name, source)
+        original_value = ENV[source.to_s]
+        define_method("orig_#{name}") do
+          original_value
+        end
+
         define_method(name) do
           @environments[source]
         end

data/lib/gondler/gomfile.rb

@@ -5,12 +5,40 @@ module Gondler
     def initialize(path)
       raise NotFound, path unless File.exist?(path)
       @packages = []
+      @itself = nil
 
       load(path)
     end
     attr_reader :packages
 
+    def itself(name)
+      @itself = name
+    end
+
+    def itself_package
+      if !@itself && Gondler.env.orig_path
+        realpath = proc do |path|
+          if File.respond_to?(:realpath) # 1.9+
+            File.realpath(path)
+          else
+            path
+          end
+        end
+
+        orig_src = realpath[File.join(Gondler.env.orig_path, 'src')]
+        dir = realpath[File.dirname(@path)]
+        if dir.start_with?(orig_src)
+          @itself = dir[orig_src.size.succ .. -1]
+        end
+      end
+
+      if @itself
+        Gondler::Package.new(@itself, :path => '.')
+      end
+    end
+
     def load(path)
+      @path = File.expand_path(path)
       instance_eval(File.read(path))
     end
 

data/lib/gondler/package.rb

@@ -1,4 +1,5 @@
 require 'English'
+require 'pathname'
 
 module Gondler
   class Package
@@ -14,8 +15,11 @@ module Gondler
       @group = options[:group]
       @fix = options[:fix] || false
       @flag = options[:flag]
+      @path = options[:path]
     end
 
+    attr_reader :name, :branch, :tag, :commit, :os, :group, :fix, :flag, :path
+
     def os
       case @os
       when String
@@ -56,19 +60,14 @@ module Gondler
     end
 
     def get
-      args = %w(go get -d -u)
-      args << '-fix' if @fix
-      args << @name
-
-      result = `#{args.join(' ')} 2>&1`
-
-      unless $CHILD_STATUS.success?
-        raise InstallError.new("#{@name} download error\n" + result)
+      if @path
+        get_by_path
+      else
+        get_by_package
       end
     end
 
     def checkout
-      src_path = Pathname.new(Gondler.env.path) + 'src'
       @name.split('/').reduce(src_path) do |path, dir|
         path += dir
         if File.directory?(path + '.git')
@@ -107,5 +106,39 @@ module Gondler
     def to_s
       "#{@name}" + (target ? " (#{target})" : '')
     end
+
+    private
+
+    def env_path
+      Pathname.new(Gondler.env.path)
+    end
+
+    def src_path
+      env_path + 'src'
+    end
+
+    def get_by_path
+      target = src_path.join(@name)
+      FileUtils.mkdir_p(target.dirname)
+      FileUtils.remove_entry_secure(target) if target.exist?
+      if @path.to_s.start_with?('/') # absolute path
+        source = @path
+      else # relative path from Gomfile
+        source = env_path.dirname.join(@path).relative_path_from(target.dirname)
+      end
+      File.symlink(source, target)
+    end
+
+    def get_by_package
+      args = %w(go get -d -u)
+      args << '-fix' if @fix
+      args << @name
+
+      result = `#{args.join(' ')} 2>&1`
+
+      unless $CHILD_STATUS.success?
+        raise InstallError.new("#{@name} download error\n" + result)
+      end
+    end
   end
 end

data/lib/gondler/version.rb

@@ -1,3 +1,3 @@
 module Gondler
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/spec/gondler/gomfile_spec.rb

@@ -1,17 +1,28 @@
 require 'spec_helper'
-require 'tempfile'
+
+require 'tmpdir'
+require 'fileutils'
+require 'pathname'
 
 describe Gondler::Gomfile do
-  let(:gomfile) { described_class.new(path) }
-  let(:file) do
-    Tempfile.open('Gomfile').tap do|f|
-      f.print(content)
-      f.flush
-    end
+  let(:tmpdir) { Dir.mktmpdir("gondler-gomfile-spec") }
+  after { FileUtils.remove_entry_secure(tmpdir) }
+
+  let(:package_dir) do
+    Pathname.new(tmpdir).join('src', 'example.com', 'test').tap(&:mkpath)
   end
-  let(:path) { file.path }
+
+  let(:path) { package_dir.join('Gomfile') }
   let(:content) { '' }
-  after { file.close! }
+
+  let(:gomfile) do
+    open(path, 'w') { |io| io.write content }
+    described_class.new(path)
+  end
+
+  before do
+    allow(Gondler.env).to receive(:orig_path) { tmpdir }
+  end
 
   describe '#initialize' do
     let(:path) { 'Gomfile' }
@@ -66,4 +77,24 @@ describe Gondler::Gomfile do
       expect(gomfile.packages.first.os).to eq(%w(darwin linux))
     end
   end
+
+  describe "#itself_package" do
+    subject(:package) { gomfile.itself_package }
+
+    it "returns package for Gomfile's repo" do
+      expect(package.name).to eq 'example.com/test'
+      expect(package.path).to eq '.'
+    end
+
+    context "with itself(...)" do
+      before do
+        gomfile.itself 'example.org/test2'
+      end
+
+      it "returns package for Gomfile's repo, but different dir" do
+        expect(package.name).to eq 'example.org/test2'
+        expect(package.path).to eq '.'
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gondler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: bundler for golang