safedep 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d198c2e776fbd9a652cdf6b86cc024f8435ad2
-  data.tar.gz: 46a70f118954452d2db915ef213b36d225bb5f54
+  metadata.gz: 132ffa3638720d8a67ed227359301f04ccd4e825
+  data.tar.gz: 9dfcd1b5e931ee79716bea0d5e967d6d034b8537
 SHA512:
-  metadata.gz: 2f0e2df394f4d2bb542593d7279dbbf4f1941a2930519cfa7bc57054ab15c1646bddbf037daf1f43ceecb1854acec8ec53a3abb23569736d36e719af7bf6c755
-  data.tar.gz: 622be6b932f9a390507248a268649bd8063855355ddc4fea6ed4fb40c1b6c4f88de093ac3b48787cbbea857c32f23e736b1ae5db4fa8210a006801b451451bb5
+  metadata.gz: b24aadff525f1c319c3c02470ceb20b731f461c908758abbd42369b39381e36a7bf513b71ea62e78ff52b7eef026f2bdd0a230a2ed28b0a8d5693e760cefe38e
+  data.tar.gz: 3b21b4c4e858c753a1d3e0a37dc96ab35d2c68578b946d8a0b75187a53b1dd95d79e6e57fcc8bccdc9f00cec8bef4983b1ab22ccbfbbb874c9588bc18ae64e22

data/.rubocop.yml

@@ -56,3 +56,6 @@ GuardClause:
 
 Documentation:
   Enabled: false
+
+SingleLineBlockParams:
+  Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v0.2.0
+
+* Skip modification of dependencies that have `:git`, `:github` or `:path` option.
+* Handle depdendencies with prerelease version.
+
 ## v0.1.2
 
 * Handle error raised when dependency definition is not found in `Gemfile.lock`.

data/Gemfile

@@ -14,6 +14,7 @@ group :development do
   gem 'guard-rspec', '~> 4.5'
   gem 'guard-rubocop', '~> 1.2'
   gem 'fuubar', '~> 2.0'
+  gem 'ruby_gntp', '~> 0.3'
 end
 
 group :test do

data/lib/safedep/abstract_dependency.rb

@@ -1,3 +1,5 @@
+require 'safedep/literal'
+
 module Safedep
   class AbstractDependency
     attr_reader :node, :rewriter
@@ -26,19 +28,24 @@ module Safedep
       fail NotImplementedError
     end
 
-    def version_specifier
-      return nil unless version_specifier_node
-      version_specifier_node.children.first
+    def version_specifiers
+      @version_specifiers ||= version_nodes.map { |node| Literal.value(node) }.flatten
     end
 
-    def version_specifier=(version_specifier)
-      if version_specifier_node
-        rewriter.replace(content_range_of_str_node(version_specifier_node), version_specifier)
+    def version_specifiers=(*specifiers)
+      source = specifiers.flatten.map { |specifier| "'#{specifier}'" }.join(', ')
+
+      if version_nodes.empty?
+        rewriter.insert_after(name_node.loc.expression, ", #{source}")
       else
-        rewriter.insert_after(name_node.loc.expression, ", '#{version_specifier}'")
+        rewriter.replace(version_range, source)
       end
     end
 
+    def options
+      {}
+    end
+
     private
 
     def method_name
@@ -49,15 +56,16 @@ module Safedep
       node.children[2]
     end
 
-    def version_specifier_node
-      return @version_specifier_node if instance_variable_defined?(:@version_specifier_node)
-      version_node = node.children[3]
-      return @version_specifier_node = nil if version_node.nil? || !version_node.str_type?
-      @version_specifier_node = version_node
+    def trailing_nodes
+      node.children[3..-1]
+    end
+
+    def version_nodes
+      fail NotImplementedError
     end
 
-    def options_node
-      node.children[3..-1].find(&:hash_type?)
+    def version_range
+      version_nodes.first.loc.expression.join(version_nodes.last.loc.expression)
     end
 
     def content_range_of_str_node(str_node)

data/lib/safedep/gemfile/dependency.rb

@@ -1,10 +1,11 @@
 require 'safedep/abstract_dependency'
+require 'safedep/util'
 require 'astrolabe/sexp'
 
 module Safedep
   class Gemfile
     class Dependency < AbstractDependency
-      include Astrolabe::Sexp
+      include Util, Astrolabe::Sexp
 
       METHOD_NAMES = [:gem].freeze
 
@@ -16,33 +17,35 @@ module Safedep
         @groups ||= (groups_via_block + groups_via_option).map(&:to_sym)
       end
 
+      def options
+        @options ||= symbolize_keys(Literal.value(options_node) || {})
+      end
+
+      private
+
       def groups_via_block
         return [] unless group_node
         _receiver_node, _message, *arg_nodes = *group_node
-        literal_nodes = arg_nodes.select { |arg_node| arg_node.sym_type? || arg_node.str_type? }
-        literal_nodes.map { |literal_node| literal_node.children.first }
+        arg_nodes.map { |node| Literal.value(node) }
       end
 
       def groups_via_option
-        return [] unless options_node
-
-        options_node.each_child_node do |pair_node|
-          key_node, value_node = *pair_node
-
-          next unless key_node == s(:sym, :group)
-
-          case value_node.type
-          when :sym
-            return [value_node.children.first]
-          when :array
-            literal_nodes = value_node.each_child_node(:sym, :str)
-            return literal_nodes.map { |literal_node| literal_node.children.first }
-          else
-            return []
-          end
-        end
+        Array(options[:group])
+      end
 
-        []
+      # https://github.com/bundler/bundler/blob/v1.7.11/lib/bundler/dsl.rb#L68-L70
+      def version_nodes
+        @version_nodes ||= trailing_nodes - [options_node]
+      end
+
+      def options_node
+        node = trailing_nodes.last
+
+        if node && node.hash_type?
+          node
+        else
+          nil
+        end
       end
 
       def group_node

data/lib/safedep/gemspec/dependency.rb

@@ -1,8 +1,11 @@
 require 'safedep/abstract_dependency'
+require 'safedep/util'
 
 module Safedep
   class Gemspec
     class Dependency < AbstractDependency
+      include Util
+
       METHOD_NAMES = [:add_runtime_dependency, :add_development_dependency, :add_dependency].freeze
 
       def self.method_names
@@ -17,6 +20,13 @@ module Safedep
           []
         end
       end
+
+      private
+
+      # https://github.com/rubygems/rubygems/blob/v2.4.5/lib/rubygems/specification.rb#L449-L473
+      def version_nodes
+        trailing_nodes
+      end
     end
   end
 end

data/lib/safedep/literal.rb

@@ -0,0 +1,48 @@
+module Safedep
+  module Literal
+    module_function
+
+    def value(node)
+      concretize(node)
+    end
+
+    def concretize(node) # rubocop:disable CyclomaticComplexity
+      return nil unless node
+
+      case node.type
+      when :true                    then true
+      when :false                   then false
+      when :nil                     then nil
+      when :int, :float, :str, :sym then node.children.first
+      when :regexp                  then concretize_regexp(node)
+      when :array                   then concretize_array(node)
+      when :hash                    then concretize_hash(node)
+      when :irange, :erange         then concretize_range(node)
+      end
+    end
+
+    def concretize_regexp(regexp_node)
+      str_node, *_interporated_nodes, regopt_node = *regexp_node
+      string = str_node.children.first
+      options = regopt_node.children.map(&:to_s).reduce(:+)
+      eval("/#{string}/#{options}") # rubocop:disable Eval
+    end
+
+    def concretize_array(array_node)
+      array_node.children.map { |child_node| concretize(child_node) }
+    end
+
+    def concretize_hash(hash_node)
+      hash_node.children.each_with_object({}) do |pair_node, hash|
+        key_node, value_node = *pair_node
+        key = concretize(key_node)
+        hash[key] = concretize(value_node) if key
+      end
+    end
+
+    def concretize_range(range_node)
+      values = range_node.children.map { |child_node| concretize(child_node) }
+      Range.new(*values, range_node.type == :erange)
+    end
+  end
+end

data/lib/safedep/policy/sem_ver.rb

@@ -0,0 +1,52 @@
+module Safedep
+  module Policy
+    class SemVer
+      attr_reader :version, :major, :minor, :patch, :suffix
+
+      def self.version_specifiers(version)
+        new(version).version_specifiers
+      end
+
+      def initialize(version)
+        @version = if version.is_a?(Gem::Version)
+                     version
+                   else
+                     Gem::Version.new(version)
+                   end
+
+        decompose_version
+      end
+
+      def version_specifiers
+        specifiers = ['~> ' + [major, minor].join('.')]
+        return specifiers if satisfy_specifiers?(specifiers)
+
+        specifiers = [">= #{version}", "< #{major.to_i + 1}"]
+        return specifiers if satisfy_specifiers?(specifiers)
+
+        nil
+      end
+
+      private
+
+      def decompose_version
+        elements =  version.to_s.split('.')
+
+        [:major, :minor, :patch].each do |role|
+          if elements.first && elements.first.match(/^\d+$/)
+            instance_variable_set("@#{role}", elements.shift)
+          else
+            instance_variable_set("@#{role}", '0')
+          end
+        end
+
+        @suffix = elements.shift if elements.first && !elements.first.match(/^\d+$/)
+      end
+
+      def satisfy_specifiers?(specifiers)
+        requirement = Gem::Requirement.new(*specifiers)
+        requirement.satisfied_by?(version)
+      end
+    end
+  end
+end

data/lib/safedep/runner.rb

@@ -2,6 +2,7 @@ require 'safedep/configuration'
 require 'safedep/gemspec'
 require 'safedep/gemfile'
 require 'safedep/gemfile_lock'
+require 'safedep/policy/sem_ver'
 require 'safedep/error'
 
 module Safedep
@@ -28,7 +29,7 @@ module Safedep
                       'Please run `bundle install`.'
         end
 
-        dep.version_specifier = safe_version_specifier(lockfile_dep.version)
+        dep.version_specifiers = version_specifiers(lockfile_dep.version)
       end
 
       gemfiles.each(&:rewrite!)
@@ -72,12 +73,13 @@ module Safedep
     end
 
     def should_ignore?(dependency)
-      return true if dependency.version_specifier
-      !(dependency.groups & configuration.skipped_groups).empty?
+      return true unless dependency.version_specifiers.empty?
+      return true unless (dependency.groups & configuration.skipped_groups).empty?
+      [:git, :github, :path].any? { |key| dependency.options[key] }
     end
 
-    def safe_version_specifier(version)
-      '~> ' << version.to_s.split('.').first(2).join('.')
+    def version_specifiers(version)
+      Policy::SemVer.version_specifiers(version)
     end
   end
 end

data/lib/safedep/util.rb

@@ -0,0 +1,16 @@
+module Safedep
+  module Util
+    module_function
+
+    def symbolize_keys(original_hash)
+      hash = original_hash.dup
+
+      original_hash.each do |key, value|
+        hash[key] = symbolize_keys(value) if value.is_a?(Hash)
+        hash[key.to_sym] = hash.delete(key) if key.is_a?(String)
+      end
+
+      hash
+    end
+  end
+end

data/lib/safedep/version.rb

@@ -2,8 +2,8 @@ module Safedep
   # http://semver.org/
   module Version
     MAJOR = 0
-    MINOR = 1
-    PATCH = 2
+    MINOR = 2
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/safedep/gemfile/dependency_spec.rb

@@ -16,6 +16,10 @@ module Safedep
           gem 'rspec', '~> 3.1'
           gem 'rubocop', require: false
         end
+
+        group :development do
+          gem 'guard', '>= 2.1', '< 3.0'
+        end
       END
 
       describe '#name' do
@@ -47,7 +51,7 @@ module Safedep
             gem 'fuubar'
           end
 
-          gem 'rspec', group: [:test, :development]
+          gem 'rspec', 'group' => [:test, :development]
         END
 
         context 'when the dependency is specified in top level' do
@@ -81,34 +85,42 @@ module Safedep
         end
       end
 
-      describe '#version_specifier' do
-        subject(:version_specifier) { dependency.version_specifier }
+      describe '#version_specifiers' do
+        subject(:version_specifiers) { dependency.version_specifiers }
 
-        context 'when the dependency has version specifier' do
+        context 'when the dependency has a version specifier' do
           let(:dependency) { gemfile.find_dependency('rspec') }
 
           it 'returns the specifier' do
-            expect(version_specifier).to eq('~> 3.1')
+            expect(version_specifiers).to eq(['~> 3.1'])
+          end
+        end
+
+        context 'when the dependency has multiple specifiers' do
+          let(:dependency) { gemfile.find_dependency('guard') }
+
+          it 'returns the specifiers' do
+            expect(version_specifiers).to eq(['>= 2.1', '< 3.0'])
           end
         end
 
         context 'when the dependency has no version specifier' do
           context 'and has no options' do
             let(:dependency) { gemfile.find_dependency('rake') }
-            it { should be_nil }
+            it { should be_empty }
           end
 
           context 'but has options' do
             let(:dependency) { gemfile.find_dependency('rubocop') }
-            it { should be_nil }
+            it { should be_empty }
           end
         end
       end
 
-      describe '#version_specifier=' do
+      describe '#version_specifiers=' do
         let(:rewritten_source) { File.read(gemfile.path) }
 
-        context 'when the dependency has version specifier' do
+        context 'when the dependency has a version specifier' do
           let(:dependency) { gemfile.find_dependency('rspec') }
 
           let(:expected_source) { <<-END.strip_indent }
@@ -121,10 +133,14 @@ module Safedep
               gem 'rspec', '> 4.0'
               gem 'rubocop', require: false
             end
+
+            group :development do
+              gem 'guard', '>= 2.1', '< 3.0'
+            end
           END
 
           it 'replaces the existing specifier with the passed specifier' do
-            dependency.version_specifier = '> 4.0'
+            dependency.version_specifiers = '> 4.0'
             gemfile.rewrite!
             expect(rewritten_source).to eq(expected_source)
           end
@@ -144,10 +160,14 @@ module Safedep
                 gem 'rspec', '~> 3.1'
                 gem 'rubocop', require: false
               end
+
+              group :development do
+                gem 'guard', '>= 2.1', '< 3.0'
+              end
             END
 
             it 'adds the passed specifier' do
-              dependency.version_specifier = '~> 10.1'
+              dependency.version_specifiers = '~> 10.1'
               gemfile.rewrite!
               expect(rewritten_source).to eq(expected_source)
             end
@@ -166,15 +186,45 @@ module Safedep
                 gem 'rspec', '~> 3.1'
                 gem 'rubocop', '~> 0.28', require: false
               end
+
+              group :development do
+                gem 'guard', '>= 2.1', '< 3.0'
+              end
             END
 
             it 'adds the passed specifier' do
-              dependency.version_specifier = '~> 0.28'
+              dependency.version_specifiers = '~> 0.28'
               gemfile.rewrite!
               expect(rewritten_source).to eq(expected_source)
             end
           end
         end
+
+        context 'when multiple specifiers are passed' do
+          let(:dependency) { gemfile.find_dependency('rspec') }
+
+          let(:expected_source) { <<-END.strip_indent }
+            source 'https://rubygems.org'
+
+            gemspec
+
+            group :development, :test do
+              gem 'rake'
+              gem 'rspec', '>= 4.0', '< 5.0'
+              gem 'rubocop', require: false
+            end
+
+            group :development do
+              gem 'guard', '>= 2.1', '< 3.0'
+            end
+          END
+
+          it 'replaces the existing specifier with the passed specifiers' do
+            dependency.version_specifiers = ['>= 4.0', '< 5.0']
+            gemfile.rewrite!
+            expect(rewritten_source).to eq(expected_source)
+          end
+        end
       end
     end
   end

data/spec/safedep/gemspec/dependency_spec.rb

@@ -10,7 +10,8 @@ module Safedep
         Gem::Specification.new do |spec|
           spec.name = 'safedep'
           spec.add_dependency 'parser'
-          spec.add_runtime_dependency 'astrolabe', '~> 1.3'
+          spec.add_runtime_dependency 'bundler', '>= 1.3.1', '< 2.0'
+          spec.add_runtime_dependency 'astrolabe', ['>= 1.3', '< 2.0']
           spec.add_development_dependency 'rspec', '~> 3.1'
         end
       END
@@ -42,59 +43,137 @@ module Safedep
         end
       end
 
-      describe '#version_specifier' do
-        subject(:version_specifier) { dependency.version_specifier }
+      describe '#version_specifiers' do
+        subject(:version_specifier) { dependency.version_specifiers }
 
-        context 'when the dependency has version specifier' do
+        context 'when the dependency has no version specifier' do
+          let(:dependency) { gemspec.find_dependency('parser') }
+          it { should be_empty }
+        end
+
+        context 'when the dependency has a version specifier' do
           let(:dependency) { gemspec.find_dependency('rspec') }
 
           it 'returns the specifier' do
-            expect(version_specifier).to eq('~> 3.1')
+            expect(version_specifier).to eq(['~> 3.1'])
           end
         end
 
-        context 'when the dependency has no version specifier' do
-          let(:dependency) { gemspec.find_dependency('parser') }
-          it { should be_nil }
+        context 'when the dependency has multiple version specifiers' do
+          let(:dependency) { gemspec.find_dependency('bundler') }
+
+          it 'returns the specifiers' do
+            expect(version_specifier).to eq(['>= 1.3.1', '< 2.0'])
+          end
+        end
+
+        context 'when the dependency has multiple version specifiers in an array' do
+          let(:dependency) { gemspec.find_dependency('astrolabe') }
+
+          it 'returns the specifiers' do
+            expect(version_specifier).to eq(['>= 1.3', '< 2.0'])
+          end
         end
       end
 
-      describe '#version_specifier=' do
+      describe '#version_specifiers=' do
         let(:rewritten_source) { File.read(gemspec.path) }
 
-        context 'when the dependency has version specifier' do
+        context 'when the dependency has no version specifier' do
+          let(:dependency) { gemspec.find_dependency('parser') }
+
+          let(:expected_source) { <<-END.strip_indent }
+            Gem::Specification.new do |spec|
+              spec.name = 'safedep'
+              spec.add_dependency 'parser', '~> 2.2'
+              spec.add_runtime_dependency 'bundler', '>= 1.3.1', '< 2.0'
+              spec.add_runtime_dependency 'astrolabe', ['>= 1.3', '< 2.0']
+              spec.add_development_dependency 'rspec', '~> 3.1'
+            end
+          END
+
+          it 'adds the passed specifier' do
+            dependency.version_specifiers = '~> 2.2'
+            gemspec.rewrite!
+            expect(rewritten_source).to eq(expected_source)
+          end
+        end
+
+        context 'when the dependency has a version specifier' do
           let(:dependency) { gemspec.find_dependency('rspec') }
 
           let(:expected_source) { <<-END.strip_indent }
             Gem::Specification.new do |spec|
               spec.name = 'safedep'
               spec.add_dependency 'parser'
-              spec.add_runtime_dependency 'astrolabe', '~> 1.3'
+              spec.add_runtime_dependency 'bundler', '>= 1.3.1', '< 2.0'
+              spec.add_runtime_dependency 'astrolabe', ['>= 1.3', '< 2.0']
               spec.add_development_dependency 'rspec', '> 4.0'
             end
           END
 
           it 'replaces the existing specifier with the passed specifier' do
-            dependency.version_specifier = '> 4.0'
+            dependency.version_specifiers = '> 4.0'
             gemspec.rewrite!
             expect(rewritten_source).to eq(expected_source)
           end
         end
 
-        context 'when the dependency has no version specifier' do
-          let(:dependency) { gemspec.find_dependency('parser') }
+        context 'when the dependency has multiple version specifiers' do
+          let(:dependency) { gemspec.find_dependency('bundler') }
 
           let(:expected_source) { <<-END.strip_indent }
             Gem::Specification.new do |spec|
               spec.name = 'safedep'
-              spec.add_dependency 'parser', '~> 2.2'
-              spec.add_runtime_dependency 'astrolabe', '~> 1.3'
+              spec.add_dependency 'parser'
+              spec.add_runtime_dependency 'bundler', '~> 2.0'
+              spec.add_runtime_dependency 'astrolabe', ['>= 1.3', '< 2.0']
               spec.add_development_dependency 'rspec', '~> 3.1'
             end
           END
 
-          it 'adds the passed specifier' do
-            dependency.version_specifier = '~> 2.2'
+          it 'replaces the existing specifiers with the passed specifier' do
+            dependency.version_specifiers = '~> 2.0'
+            gemspec.rewrite!
+            expect(rewritten_source).to eq(expected_source)
+          end
+        end
+
+        context 'when the dependency has multiple version specifiers in an array' do
+          let(:dependency) { gemspec.find_dependency('astrolabe') }
+
+          let(:expected_source) { <<-END.strip_indent }
+            Gem::Specification.new do |spec|
+              spec.name = 'safedep'
+              spec.add_dependency 'parser'
+              spec.add_runtime_dependency 'bundler', '>= 1.3.1', '< 2.0'
+              spec.add_runtime_dependency 'astrolabe', '~> 2.0'
+              spec.add_development_dependency 'rspec', '~> 3.1'
+            end
+          END
+
+          it 'replaces the existing specifiers with the passed specifier' do
+            dependency.version_specifiers = '~> 2.0'
+            gemspec.rewrite!
+            expect(rewritten_source).to eq(expected_source)
+          end
+        end
+
+        context 'when multiple specifiers are passed' do
+          let(:dependency) { gemspec.find_dependency('rspec') }
+
+          let(:expected_source) { <<-END.strip_indent }
+            Gem::Specification.new do |spec|
+              spec.name = 'safedep'
+              spec.add_dependency 'parser'
+              spec.add_runtime_dependency 'bundler', '>= 1.3.1', '< 2.0'
+              spec.add_runtime_dependency 'astrolabe', ['>= 1.3', '< 2.0']
+              spec.add_development_dependency 'rspec', '>= 3.1', '< 4.0'
+            end
+          END
+
+          it 'replaces the existing specifier with the passed specifier' do
+            dependency.version_specifiers = ['>= 3.1', '< 4.0']
             gemspec.rewrite!
             expect(rewritten_source).to eq(expected_source)
           end

data/spec/safedep/literal_spec.rb

@@ -0,0 +1,49 @@
+require 'safedep/literal'
+require 'astrolabe/builder'
+require 'parser/current'
+
+module Safedep
+  describe Literal do
+    let(:node) do
+      builder = Astrolabe::Builder.new
+      parser = Parser::CurrentRuby.new(builder)
+      parser.parse(source_buffer)
+    end
+
+    let(:source_buffer) do
+      Parser::Source::Buffer.new('(string)').tap do |buffer|
+        buffer.source = source
+      end
+    end
+
+    describe '.value' do
+      subject { Literal.value(node) }
+
+      [
+        true,
+        false,
+        nil,
+        123,
+        3.14,
+        'foo',
+        :foo,
+        /foo/im,
+        ['foo', 123],
+        { 'foo' => 123, bar: false },
+        1..3,
+        1...3,
+        { 'foo' => [:bar, { baz: 3.14 }] }
+      ].each do |value|
+        context "with #{value.inspect} node" do
+          let(:source) { value.inspect }
+          it { should eq(value) }
+        end
+      end
+
+      context 'when nil is passed' do
+        let(:node) { nil }
+        it { should be_nil }
+      end
+    end
+  end
+end

data/spec/safedep/policy/sem_ver_spec.rb

@@ -0,0 +1,35 @@
+require 'safedep/policy/sem_ver'
+
+module Safedep
+  module Policy
+    describe SemVer do
+      describe '.version_specifiers' do
+        subject { SemVer.version_specifiers(version) }
+
+        [
+          ['0.0.1',       ['~> 0.0']],
+          ['1.2.34',      ['~> 1.2']],
+          ['1.2',         ['~> 1.2']],
+          ['1',           ['~> 1.0']],
+          ['1.2.1.beta1', ['~> 1.2']],
+          ['1.2.0.beta1', ['>= 1.2.0.beta1', '< 2']],
+          ['1.2.beta1',   ['>= 1.2.beta1', '< 2']],
+          ['1.beta1',     ['>= 1.beta1', '< 2']]
+        ].each do |version_string, specifiers|
+          context "with #{version_string}" do
+            let(:version) { Gem::Version.new(version_string) }
+            let(:requirement) { Gem::Requirement.new(*specifiers) }
+
+            it { should eq(specifiers) }
+
+            if specifiers
+              it 'returns version specifiers satisfied by the passed version' do
+                expect(requirement).to be_satisfied_by(version)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/safedep/runner_spec.rb

@@ -83,11 +83,56 @@ module Safedep
 
       it 'does not modify dependencies that belong to any of the groups' do
         development_dependencies.each do |dep|
-          expect(dep).not_to receive(:version_specifier=)
+          expect(dep).not_to receive(:version_specifiers=)
         end
 
         runner.run
       end
     end
+
+    context 'when a dependency has :git option', :gemfile, :lockfile do
+      let(:gemfile_source) { <<-END.strip_indent }
+        source 'https://rubygems.org'
+
+        group :development, :test do
+          gem 'rubocop', git: 'https://github.com/bbatsov/rubocop.git'
+        end
+      END
+
+      it 'does not add version specifiers to the dependency' do
+        runner.run
+        expect(rewritten_gemfile_source).to eq(gemfile_source)
+      end
+    end
+
+    context 'when a dependency has :github option', :gemfile, :lockfile do
+      let(:gemfile_source) { <<-END.strip_indent }
+        source 'https://rubygems.org'
+
+        group :development, :test do
+          gem 'rubocop', github: 'bbatsov/rubocop.git'
+        end
+      END
+
+      it 'does not add version specifiers to the dependency' do
+        runner.run
+        expect(rewritten_gemfile_source).to eq(gemfile_source)
+      end
+    end
+
+    context 'when a dependency has :path option', :gemfile, :lockfile do
+      let(:gemfile_source) { <<-END.strip_indent }
+        source 'https://rubygems.org'
+
+        group :development, :test do
+          gem 'rubocop', path: '../rubocop'
+        end
+      END
+
+      it 'does not add version specifiers to the dependency' do
+        runner.run
+        expect(rewritten_gemfile_source).to eq(gemfile_source)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safedep
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -82,7 +82,10 @@ files:
 - lib/safedep/gemfile_lock.rb
 - lib/safedep/gemspec.rb
 - lib/safedep/gemspec/dependency.rb
+- lib/safedep/literal.rb
+- lib/safedep/policy/sem_ver.rb
 - lib/safedep/runner.rb
+- lib/safedep/util.rb
 - lib/safedep/version.rb
 - safedep.gemspec
 - spec/.rubocop.yml
@@ -92,6 +95,8 @@ files:
 - spec/safedep/gemfile_spec.rb
 - spec/safedep/gemspec/dependency_spec.rb
 - spec/safedep/gemspec_spec.rb
+- spec/safedep/literal_spec.rb
+- spec/safedep/policy/sem_ver_spec.rb
 - spec/safedep/runner_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_helper.rb
@@ -128,6 +133,8 @@ test_files:
 - spec/safedep/gemfile_spec.rb
 - spec/safedep/gemspec/dependency_spec.rb
 - spec/safedep/gemspec_spec.rb
+- spec/safedep/literal_spec.rb
+- spec/safedep/policy/sem_ver_spec.rb
 - spec/safedep/runner_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_helper.rb