elm_install 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ac8a8d664399020fed3aab08c9f510dfc0b342
-  data.tar.gz: f4fcd64db986475dd59293484060510fd7a039fd
+  metadata.gz: 2c6f2e9e7bc312adb591680f029bb8ffe931d9eb
+  data.tar.gz: ae3e9b0a3d08c052f6dd9010fb36d55066e673b7
 SHA512:
-  metadata.gz: 84484f3b601baeb593ec56dc8fb751b015795a64855ede99038bd245f4cd379103c756a58d05264ce8f4d2cc6c76403fe57499e83346ba16590ba995cb4b9c18
-  data.tar.gz: 34745ee40861cf12e2511e6998b003239a09ac591defbd5f7889f0ad8d3aab0b0855ba6e17f49fb47f13d0d2be7d08865ae3480419236ff830ec8e2373d2a245
+  metadata.gz: b1c8dc7e9c48edc0e89d300b24dda4f82c184d57b4c3eb6b3540c1a762a2649c1febab6acd0ce267157114a4e34d371b365f1bbfe02381d4b1792b7b9b015517
+  data.tar.gz: abd5efb9133618afb67407f22fea9b554a31f88f706b572e803af6af2a67306903249ad69b6c4d838953a9d7344522be409667eda41294b28fcf02713e1df8c1

data/.rubocop.yml

@@ -8,3 +8,7 @@ Metrics/MethodLength:
   Enabled: False
 Metrics/AbcSize:
   Enabled: False
+ClassLength:
+  Enabled: False
+ClassVars:
+  Enabled: False

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elm_install (1.2.0)
+    elm_install (1.3.0)
       adts (~> 0.1.2)
       commander (~> 4.4, >= 4.4.2)
       contracts (~> 0.16.0)
@@ -120,7 +120,7 @@ GEM
     simplecov-html (0.10.0)
     slop (3.6.0)
     smart_colored (1.1.1)
-    solve (3.1.0)
+    solve (3.1.1)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     sparkr (0.4.1)

data/Readme.md

@@ -162,6 +162,12 @@ OPTIONS:
   --verbose
 ```
 
+## Known Issues
+* Using the NPM package or the released binaries in windows while specifing a
+  relative directory as a package will fail because of the 2.2 travelling
+  ruby dependency. Using the >Ruby 2.3 with the gem installed works properly.
+  More #36
+
 ## FAQ
 
 #### Do I need to use SSH keys?

data/lib/elm_install/git_source.rb

@@ -33,7 +33,12 @@ module ElmInstall
         when Branch::Just
           @branch.ref
         when Branch::Nothing
-          version.to_simple
+          case version
+          when String
+            version
+          else
+            version.to_simple
+          end
         end
 
       repository.checkout ref
@@ -63,14 +68,15 @@ module ElmInstall
       nil
     end
 
-    Contract ArrayOf[Solve::Constraint] => ArrayOf[Semverse::Version]
+    Contract ArrayOf[Solve::Constraint], String => ArrayOf[Semverse::Version]
     # Returns the available versions for a repository
     #
     # @param constraints [Array] The constraints
+    # @param elm_version [String] The Elm version to match against
     #
     # @return [Array] The versions
-    def versions(constraints)
-      if repository.cloned?
+    def versions(constraints, elm_version)
+      if repository.cloned? && !repository.fetched?
         # Get updates from upstream
         Logger.arrow "Getting updates for: #{package_name.bold}"
         repository.fetch
@@ -80,21 +86,23 @@ module ElmInstall
       when Branch::Just
         [identifier.version(fetch(@branch.ref))]
       when Branch::Nothing
-        matching_versions constraints
+        matching_versions constraints, elm_version
       end
     end
 
-    Contract ArrayOf[Solve::Constraint] => ArrayOf[Semverse::Version]
+    Contract ArrayOf[Solve::Constraint], String => ArrayOf[Semverse::Version]
     # Returns the matchign versions for a repository for the given constraints
     #
     # @param constraints [Array] The constraints
+    # @param elm_version [String] The Elm version to match against
     #
     # @return [Array] The versions
-    def matching_versions(constraints)
+    def matching_versions(constraints, elm_version)
       repository
         .versions
         .select do |version|
-          constraints.all? { |constraint| constraint.satisfies?(version) }
+          identifier.elm_version(fetch(version.to_s)) == elm_version &&
+            constraints.all? { |constraint| constraint.satisfies?(version) }
         end
         .sort
         .reverse

data/lib/elm_install/identifier.rb

@@ -7,6 +7,9 @@ module ElmInstall
     # @return [Hash] The options
     attr_reader :options
 
+    # @return [String] The initial Elm version
+    attr_reader :initial_elm_version
+
     Contract Dir, Hash => Identifier
     # Initialize a new identifier.
     #
@@ -17,6 +20,7 @@ module ElmInstall
     def initialize(directory, options = {})
       @options = options
       @dependency_sources = dependency_sources directory
+      @initial_elm_version = elm_version directory
       @initial_dependencies = identify directory
       self
     end
@@ -41,6 +45,24 @@ module ElmInstall
       Semverse::Version.new(json(directory)['version'])
     end
 
+    Contract Dir => String
+    # Returns the Elm version for a package
+    #
+    # @param directory [Dir] The directory
+    #
+    # @return [String] The version
+    def elm_version(directory)
+      if json(directory)['elm-version'] =~ /<\s*0\.19/
+        '0.18'
+      elsif json(directory)['elm-version'] =~ /<\s*0\.18/
+        '0.17'
+      elsif json(directory)['elm-version'] =~ /<\s*0\.17/
+        '0.16'
+      else
+        ''
+      end
+    end
+
     Contract Dir => ArrayOf[Dependency]
     # Identifies dependencies from a directory
     #

data/lib/elm_install/repository.rb

@@ -11,7 +11,7 @@ module ElmInstall
     # @return [String]
     attr_reader :path
 
-    def_delegators :repo, :fetch
+    @@fetched = {}
 
     Contract String, String => Repository
     # Initializes a repository.
@@ -76,6 +76,22 @@ module ElmInstall
       Dir.exist?(path)
     end
 
+    # Returns if the repository has been fetched yet or not.
+    #
+    # @return [Bool]
+    def fetched?
+      @@fetched.key?(url)
+    end
+
+    # Fetches changes from a repository
+    #
+    # @return [Void]
+    def fetch
+      return if fetched?
+      repo.fetch
+      @@fetched[url] = true
+    end
+
     Contract None => Git::Base
     # Clones the repository
     #
@@ -83,6 +99,7 @@ module ElmInstall
     def clone
       Logger.arrow "Package: #{url.bold} not found in cache, cloning..."
       FileUtils.mkdir_p path
+      @@fetched[url] = true
       @repo = Git.clone(url, path)
     end
   end

data/lib/elm_install/resolver.rb

@@ -36,14 +36,13 @@ module ElmInstall
     #
     # @return nil
     def resolve_dependency(dependency)
-      return if @dependencies[dependency.name]
-
       @dependencies[dependency.name] ||= dependency
 
       dependency
         .source
-        .versions(dependency.constraints)
+        .versions(dependency.constraints, @identifier.initial_elm_version)
         .each do |version|
+          next if @graph.artifact?(dependency.name, version)
           resolve_dependencies(dependency, version)
         end
 

data/lib/elm_install/version.rb

@@ -1,4 +1,4 @@
 module ElmInstall
   # The version of ElmInstall
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-github-install",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Install Elm packages directly from Git repositories",
   "scripts": {
     "install": "node scripts/install.js",

data/packaging/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 ruby '2.2.2'
 
-gem 'elm_install', '1.2.0'
+gem 'elm_install', '1.3.0'

data/packaging/Gemfile.lock

@@ -5,26 +5,25 @@ GEM
     commander (4.4.3)
       highline (~> 1.7.2)
     contracts (0.16.0)
-    elm_install (1.1.0)
+    elm_install (1.2.0)
       adts (~> 0.1.2)
       commander (~> 4.4, >= 4.4.2)
       contracts (~> 0.16.0)
       git (~> 1.3)
       git_clone_url (~> 2.0)
-      hashdiff (~> 0.3.1)
       indentation (~> 0.1.1)
+      molinillo (= 0.5.7)
       smart_colored (~> 1.1, >= 1.1.1)
       solve (~> 3.1)
     git (1.3.0)
     git_clone_url (2.0.0)
       uri-ssh_git (>= 2.0)
-    hashdiff (0.3.4)
     highline (1.7.8)
     indentation (0.1.1)
     molinillo (0.5.7)
     semverse (2.0.0)
     smart_colored (1.1.1)
-    solve (3.1.0)
+    solve (3.1.1)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     uri-ssh_git (2.0.0)
@@ -33,7 +32,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  elm_install (= 1.1.0)
+  elm_install (= 1.2.0)
 
 RUBY VERSION
    ruby 2.2.2p95

data/spec/elm_install_spec.rb

@@ -1,8 +1,7 @@
 describe ElmInstall do
   it 'should install packages' do
-    expect(ElmInstall::Logger)
+    allow(ElmInstall::Logger)
       .to receive(:arrow)
-      .twice
 
     expect_any_instance_of(ElmInstall::Installer)
       .to receive(:install)

data/spec/git_source_spec.rb

@@ -50,11 +50,24 @@ describe ElmInstall::GitSource do
         expect(repository)
           .to receive(:fetch)
 
+        expect(repository)
+          .to receive(:fetched?)
+          .and_return(false)
+
         expect(repository)
           .to receive(:versions)
           .and_return([Semverse::Version.new('1.0.0')])
 
-        subject.versions([])
+        expect(repository)
+          .to receive(:checkout)
+          .with('1.0.0')
+          .and_return(Dir.new('.'))
+
+        expect(subject)
+          .to receive(:identifier)
+          .and_return(double(elm_version: '0.18'))
+
+        subject.versions([], '0.18')
       end
     end
 
@@ -88,6 +101,10 @@ describe ElmInstall::GitSource do
               expect(repository)
                 .to receive(:fetch)
 
+              expect(repository)
+                .to receive(:fetched?)
+                .and_return(false)
+
               expect(subject)
                 .to receive(:identifier)
                 .and_return(double(version: Semverse::Version.new('1.0.0')))
@@ -96,7 +113,7 @@ describe ElmInstall::GitSource do
                 .to receive(:checkout)
                 .and_return(Dir.new('.'))
 
-              subject.versions([])
+              subject.versions([], '0.18')
             end
           end
         end
@@ -107,11 +124,24 @@ describe ElmInstall::GitSource do
           expect(repository)
             .to receive(:fetch)
 
+          expect(repository)
+            .to receive(:fetched?)
+            .and_return(false)
+
+          expect(repository)
+            .to receive(:checkout)
+            .with('1.0.0')
+            .and_return(Dir.new('.'))
+
+          expect(subject)
+            .to receive(:identifier)
+            .and_return(double(elm_version: '0.18'))
+
           expect(repository)
             .to receive(:versions)
             .and_return([Semverse::Version.new('1.0.0')])
 
-          subject.versions([])
+          subject.versions([], '0.18')
         end
       end
     end

data/spec/identifer_spec.rb

@@ -32,9 +32,8 @@ describe ElmInstall::Identifier do
     let(:package_json) { '' }
 
     it 'throws an error' do
-      expect(ElmInstall::Logger)
+      allow(ElmInstall::Logger)
         .to receive(:arrow)
-        .twice
 
       subject
     end

data/spec/installer_spec.rb

@@ -29,11 +29,10 @@ describe ElmInstall::Installer do
 
   context 'sucessfull install' do
     before do
-      expect(File)
+      allow(File)
         .to receive(:read)
         .with(File.join(Dir.pwd, 'elm-package.json'))
         .and_return(main_package)
-        .twice
 
       expect(File)
         .to receive(:read)
@@ -74,11 +73,10 @@ describe ElmInstall::Installer do
     end
 
     before do
-      expect(File)
+      allow(File)
         .to receive(:read)
         .with(File.join(Dir.pwd, 'elm-package.json'))
         .and_return(main_package)
-        .twice
 
       expect(subject)
         .to receive(:results)

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ RSpec.configure do |config|
   config.before do
     allow(Process).to receive(:exit)
     allow(ElmInstall::Logger).to receive(:puts)
+    ElmInstall::Repository.class_variable_set('@@fetched', {})
     FileUtils.mkdir_p CACHE_DIRECTORY
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elm_install
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gusztáv Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git