elm_install 0.3.1 → 1.0.0

data/lib/elm_install/types.rb

@@ -0,0 +1,43 @@
+module ElmInstall
+  # Represents a branch
+  Branch = ADT do
+    Just(ref: String) |
+      Nothing()
+  end
+
+  # Represents an uri
+  Uri = ADT do
+    Ssh(uri: URI::SshGit::Generic) do
+      def to_s
+        uri.to_s
+      end
+    end |
+
+      Http(uri: URI::HTTP) do
+        def to_s
+          uri.to_s
+        end
+      end |
+
+      Github(name: String) do
+        def to_s
+          "https://github.com/#{name}"
+        end
+      end
+  end
+
+  # Represents a source type
+  Type = ADT do
+    Git(uri: Uri, branch: Branch) do
+      def source
+        @source ||= GitSource.new uri, branch
+      end
+    end |
+
+      Directory(path: Pathname) do
+        def source
+          @source ||= DirectorySource.new path
+        end
+      end
+  end
+end

data/lib/elm_install/utils.rb

@@ -1,6 +1,9 @@
 module ElmInstall
   # This module contains utility functions.
   module Utils
+    include Contracts::Core
+    include Contracts::Builtin
+
     module_function
 
     # Regexes for converting constraints.
@@ -11,29 +14,20 @@ module ElmInstall
       /(.*)<v/ => '>'
     }.freeze
 
-    # Transform constraints form Elm's package format to semver's.
+    Contract String => [Solve::Constraint]
+    # Transform an 'elm' constraint into a proper one.
     #
-    # @param constraint [String] The input constraint
+    # @param elm_constraint [String] The elm constraint
     #
-    # @return [Array] The output constraints
-    def transform_constraint(constraint)
-      constraint.gsub!(/\s/, '')
-
-      CONVERTERS.map do |regexp, prefix|
-        match = constraint.match(regexp)
-        "#{prefix} #{match[1]}" if match
-      end.compact
-    end
+    # @return [Array] The transform constraints
+    def transform_constraint(elm_constraint)
+      elm_constraint.gsub!(/\s/, '')
 
-    # Returns the path for a package with the given version.
-    #
-    # @param package [String] The package
-    # @param version [String] The version
-    #
-    # @return [Strin] The path
-    def package_version_path(package, version)
-      package_name = GitCloneUrl.parse(package).path.sub(%r{^/}, '')
-      [package_name, File.join('elm-stuff', 'packages', package_name, version)]
+      CONVERTERS
+        .map { |regexp, prefix| [elm_constraint.match(regexp), prefix] }
+        .select { |(match)| match }
+        .map { |(match, prefix)| "#{prefix} #{match[1]}" }
+        .map { |constraint| Solve::Constraint.new constraint }
     end
   end
 end

data/lib/elm_install/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-github-install",
-  "version": "0.3.1",
+  "version": "1.0.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'
+gem 'elm_install', '1.0.0'

data/packaging/Gemfile.lock

@@ -1,10 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    adts (0.1.2)
     commander (4.4.3)
       highline (~> 1.7.2)
-    elm_install (0.3.0)
+    contracts (0.16.0)
+    elm_install (1.0.0.pre.rc)
+      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)
@@ -14,10 +18,10 @@ GEM
     git (1.3.0)
     git_clone_url (2.0.0)
       uri-ssh_git (>= 2.0)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     highline (1.7.8)
     indentation (0.1.1)
-    molinillo (0.5.5)
+    molinillo (0.5.7)
     semverse (2.0.0)
     smart_colored (1.1.1)
     solve (3.1.0)
@@ -29,7 +33,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  elm_install
+  elm_install (= 1.0.0.pre.rc)
 
 RUBY VERSION
    ruby 2.2.2p95

data/scripts/install.js

@@ -39,13 +39,13 @@ var download = function(suffix){
     .pipe(extractor)
 }
 
-if(platform == 'linux' && arch == 'x64') {
+if(platform === 'linux' && arch === 'x64') {
   download('linux-x86_64')
-} else if (platform == 'linux') {
+} else if (platform === 'linux') {
   download('linux-x86')
-} else if (platform == 'darwin') {
+} else if (platform === 'darwin') {
   download('osx')
-} else if (platform == 'win32') {
+} else if (platform === 'win32') {
   var tmpFile = tmp.fileSync()
   var url =
     [ prefix,

data/scripts/run.js

@@ -26,13 +26,13 @@ var executablePath = function(suffix) {
   )
 }
 
-if(platform == 'linux' && arch == 'x64') {
+if(platform === 'linux' && arch === 'x64') {
   execute('linux-x86_64')
-} else if (platform == 'linux') {
+} else if (platform === 'linux') {
   execute('linux-x86')
-} else if (platform == 'darwin') {
+} else if (platform === 'darwin') {
   execute('osx')
-} else if (platform == 'win32') {
+} else if (platform === 'win32') {
   exec(executablePath('win32') + '.bat', [ process.argv.slice(2) ], { stdio: 'inherit' })
 } else {
   console.log('Your operating system is not supported.')

data/spec/directory_source_spec.rb

@@ -0,0 +1,37 @@
+describe ElmInstall::DirectorySource do
+  let(:dir) { Pathname.new('.') }
+
+  subject { described_class.new dir }
+
+  describe '#fetch' do
+    it 'returns the directory' do
+      expect(subject.fetch('').path).to eq dir.expand_path.to_s
+    end
+  end
+
+  describe '#copy_to' do
+    it 'symlinks the directory' do
+      allow(FileUtils).to receive(:rm_rf)
+      expect(FileUtils).to receive(:mkdir_p)
+      expect(FileUtils).to receive(:ln_s)
+      subject.copy_to(Semverse::Version.new('1.0.0'), dir)
+    end
+  end
+
+  describe '#versions' do
+    let(:identifier) do
+      double :identifier, version: Semverse::Version.new('1.0.0')
+    end
+
+    it 'returns version' do
+      subject.identifier = identifier
+      subject.versions([])
+    end
+  end
+
+  describe '#to_log' do
+    it 'returns the url' do
+      expect(subject.to_log).to eq dir.expand_path.to_s
+    end
+  end
+end

data/spec/{eml_install_spec.rb → elm_install_spec.rb}

@@ -1,9 +1,12 @@
-require 'spec_helper'
-
 describe ElmInstall do
   it 'should install packages' do
+    expect(ElmInstall::Logger)
+      .to receive(:arrow)
+      .twice
+
     expect_any_instance_of(ElmInstall::Installer)
       .to receive(:install)
-    subject.install
+
+    subject.install(cache_directory: CACHE_DIRECTORY)
   end
 end

data/spec/git_source_spec.rb

@@ -0,0 +1,115 @@
+describe ElmInstall::GitSource do
+  subject { described_class.new uri, branch }
+
+  let(:uri) do
+    ElmInstall::Uri::Ssh(GitCloneUrl.parse('git@github.com:test/repo'))
+  end
+
+  let(:branch) do
+    ElmInstall::Branch::Nothing()
+  end
+
+  before do
+    subject.options = { cache_directory: CACHE_DIRECTORY }
+  end
+
+  let(:repository) do
+    double
+  end
+
+  describe '#repository' do
+    it 'returns the repository' do
+      subject.repository
+    end
+
+    context 'Github' do
+      let(:uri) do
+        ElmInstall::Uri::Github('test/repo')
+      end
+
+      it 'returns the repository' do
+        subject.repository
+      end
+    end
+  end
+
+  context 'With repository' do
+    before do
+      allow(subject)
+        .to receive(:repository)
+        .and_return(repository)
+    end
+
+    context 'Github' do
+      let(:uri) do
+        ElmInstall::Uri::Github('test/repo')
+      end
+
+      it 'returns the versions' do
+        expect(repository)
+          .to receive(:fetch)
+
+        expect(repository)
+          .to receive(:versions)
+          .and_return([], [Semverse::Version.new('1.0.0')])
+
+        subject.versions([])
+      end
+    end
+
+    context 'Ssh' do
+      describe '#fetch' do
+        it 'checks out the given version' do
+          expect(repository)
+            .to receive(:checkout)
+            .with('1.0.0')
+            .and_return(Dir.new('.'))
+
+          subject.fetch(Semverse::Version.new('1.0.0'))
+        end
+
+        context 'With branch' do
+          let(:branch) do
+            ElmInstall::Branch::Just('test')
+          end
+
+          it 'checkout out the reference' do
+            expect(repository)
+              .to receive(:checkout)
+              .with('test')
+              .and_return(Dir.new('.'))
+
+            subject.fetch(Semverse::Version.new('1.0.0'))
+          end
+
+          describe '#versions' do
+            it 'returns the versions' do
+              expect(subject)
+                .to receive(:identifier)
+                .and_return(double(version: Semverse::Version.new('1.0.0')))
+
+              expect(repository)
+                .to receive(:checkout)
+                .and_return(Dir.new('.'))
+
+              subject.versions([])
+            end
+          end
+        end
+      end
+
+      describe '#versions' do
+        it 'returns the versions' do
+          expect(repository)
+            .to receive(:fetch)
+
+          expect(repository)
+            .to receive(:versions)
+            .and_return([], [Semverse::Version.new('1.0.0')])
+
+          subject.versions([])
+        end
+      end
+    end
+  end
+end

data/spec/identifer_spec.rb

@@ -0,0 +1,53 @@
+describe ElmInstall::Identifier do
+  subject { described_class.new Dir.new('.') }
+
+  let(:package_json) do
+    {
+      'dependencies' =>
+      {
+        'test/test' => '1.0.0 <= v < 2.0.0',
+        'test/ref' => '1.0.0 <= v < 2.0.0',
+        'test/dir' => '1.0.0 <= v < 2.0.0'
+      },
+      'dependency-sources' =>
+      {
+        'test/test' => 'git@github.com:test/test',
+        'test/ref' => {
+          url: 'http://www.github.com/test/test.git',
+          ref: 'master'
+        },
+        'test/dir' => '../'
+      },
+      version: '1.0.0'
+    }.to_json
+  end
+
+  before do
+    allow(File)
+      .to receive(:read)
+      .and_return(package_json)
+  end
+
+  describe 'Invalid json' do
+    let(:package_json) { '' }
+
+    it 'throws an error' do
+      expect(ElmInstall::Logger)
+        .to receive(:arrow)
+        .twice
+
+      subject
+    end
+  end
+
+  describe '#version' do
+    it 'returns the version from the json' do
+      expect(subject.version(Dir.new('.')))
+        .to eq(Semverse::Version.new('1.0.0'))
+    end
+  end
+
+  it 'identifies sources and dependencies' do
+    subject
+  end
+end

data/spec/installer_spec.rb

@@ -1,71 +1,102 @@
-require 'spec_helper'
-
 describe ElmInstall::Installer do
   subject { described_class.new cache_directory: CACHE_DIRECTORY }
 
   let(:main_package) do
-    { dependencies: { 'base/core' => '1.0.0 <= v < 2.0.0' } }.to_json
+    {
+      dependencies:
+        {
+          'base/core' => '1.0.0 <= v < 2.0.0',
+          'base/uri' => '1.0.0 <= v < 2.0.0',
+          'base/ssh' => '1.0.0 <= v < 2.0.0'
+        },
+      'dependency-sources' => {
+        'base/uri' => 'https://github.com/base/uri',
+        'base/ssh' => {
+          url: 'git@github.com:base/ssh',
+          ref: 'test'
+        }
+      }
+    }.to_json
   end
 
   let(:base_package) do
-    { dependencies: {} }.to_json
+    { dependencies: { 'test/core' => '1.0.0 <= v < 2.0.0' } }.to_json
+  end
+
+  let(:empty_package) do
+    {}.to_json
   end
 
   context 'sucessfull install' do
     before do
       expect(File)
         .to receive(:read)
-        .and_return(main_package, base_package, base_package)
+        .with(File.join(Dir.pwd, 'elm-package.json'))
+        .and_return(main_package)
+        .twice
 
-      expect_any_instance_of(ElmInstall::Resolver)
-        .to receive(:add_constraints)
+      expect(File)
+        .to receive(:read)
+        .with(File.join(Dir.new(CACHE_DIRECTORY), 'elm-package.json'))
+        .and_return(base_package, empty_package, empty_package, empty_package)
 
-      expect(subject)
-        .to receive(:puts)
-        .exactly(4).times
+      allow_any_instance_of(ElmInstall::GitSource)
+        .to receive(:versions)
+        .and_return([Semverse::Version.new('1.0.0')])
 
-      expect(File)
-        .to receive(:binwrite)
-        .with('spec/fixtures/cache/ref-cache.json', any_args)
+      allow_any_instance_of(ElmInstall::GitSource)
+        .to receive(:fetch)
+        .with(Semverse::Version.new('1.0.0'))
+        .and_return Dir.new(CACHE_DIRECTORY)
 
-      expect(File)
-        .to receive(:binwrite)
-        .with('spec/fixtures/cache/cache.json', any_args)
+      expect(ElmInstall::Logger)
+        .to receive(:dot)
+        .exactly(4).times
+
+      expect(subject)
+        .to receive(:puts)
+        .exactly(3).times
 
       expect(File)
         .to receive(:binwrite)
         .with('elm-stuff/exact-dependencies.json', any_args)
+        .and_return(0)
     end
 
-    it 'should install dependencies' do
+    it 'installs dependencies' do
       subject.install
     end
   end
 
   context 'unsuccessfull install' do
+    let(:main_package) do
+      { dependencies: { 'base/test' => '1.0.0 <= v < 2.0.0' } }.to_json
+    end
+
     before do
       expect(File)
         .to receive(:read)
-        .and_return(main_package, base_package, base_package)
-
-      expect_any_instance_of(ElmInstall::Resolver)
-        .to receive(:add_constraints)
-        .exactly(2).times
+        .with(File.join(Dir.pwd, 'elm-package.json'))
+        .and_return(main_package)
+        .twice
 
       expect(subject)
-        .to receive(:populate_elm_stuff)
-        .exactly(2).times
+        .to receive(:results)
         .and_raise(Solve::Errors::NoSolutionError)
 
+      expect_any_instance_of(ElmInstall::GitSource)
+        .to receive(:versions)
+        .and_return([])
+
       expect(ElmInstall::Logger)
         .to receive(:arrow)
 
       expect(subject)
         .to receive(:puts)
-        .exactly(4).times
+        .exactly(2).times
     end
 
-    it 'should install dependencies' do
+    it 'does not install anything' do
       subject.install
     end
   end