elm_install 0.3.1 → 1.0.0

data/spec/repository_spec.rb

@@ -0,0 +1,44 @@
+describe ElmInstall::Repository do
+  subject { described_class.new '', '.' }
+
+  describe '#clone' do
+    it 'clones the repository' do
+      expect(FileUtils)
+        .to receive(:mkdir_p)
+
+      expect(Git)
+        .to receive(:clone)
+        .with('', '.')
+        .and_return(Git::Base.new)
+
+      subject.clone
+    end
+  end
+
+  describe '#checkout' do
+    it 'checks out the given reference' do
+      expect_any_instance_of(Git::Base)
+        .to receive(:reset_hard)
+        .twice
+
+      expect_any_instance_of(Git::Base)
+        .to receive(:checkout).with('')
+
+      subject.checkout('')
+    end
+  end
+
+  describe '#versions' do
+    it 'returns the versions of the repository' do
+      expect_any_instance_of(Git::Base)
+        .to receive(:reset_hard)
+
+      expect_any_instance_of(Git::Base)
+        .to receive(:tags)
+        .and_return [double(name: 'test'), double(name: '1.0.0')]
+
+      expect(subject.versions)
+        .to eq([Semverse::Version.new('1.0.0')])
+    end
+  end
+end

data/spec/resolver_spec.rb

@@ -1,75 +1,2 @@
-require 'spec_helper'
-
 describe ElmInstall::Resolver do
-  subject { described_class.new cache, git_resolver }
-
-  let(:git_resolver) { ElmInstall::GitResolver.new directory: CACHE_DIRECTORY }
-  let(:cache) { ElmInstall::Cache.new directory: CACHE_DIRECTORY }
-
-  let(:directory) { File.join CACHE_DIRECTORY, 'github.com/test/repo' }
-  let(:core_directory) { File.join CACHE_DIRECTORY, 'github.com/base/core' }
-
-  let(:package_json) do
-    { dependencies: { 'base/core' => '1.0.0 <= v < 2.0.0' } }.to_json
-  end
-
-  before do
-    FileUtils.mkdir_p directory
-    File.binwrite File.join(directory, 'elm-package.json'), package_json
-    Git.init directory
-  end
-
-  let(:url) { 'git@github.com:test/repo' }
-
-  let(:core_repo) do
-    repo = Git.init core_directory
-    File.binwrite File.join(core_directory, 'elm-package.json'), '{}'
-    repo
-  end
-
-  it 'should resolve packages' do
-    expect(Git)
-      .to receive(:clone) { core_repo }
-
-    expect(Git)
-      .to receive(:ls_remote)
-      .and_return(tags: { name: '1.0.0' })
-
-    expect(ElmInstall::Logger)
-      .to receive(:arrow)
-      .with "Package: #{'https://github.com/base/core'.bold} not found in \
-             cache, cloning...".gsub(/\s+/, ' ')
-
-    allow_any_instance_of(Git::Remote)
-      .to receive(:url)
-      .and_return url
-
-    allow_any_instance_of(Git::Base)
-      .to receive(:tags)
-      .and_return [double(name: '1.0.0')]
-
-    allow_any_instance_of(Git::Base)
-      .to receive(:checkout)
-
-    subject
-      .instance_variable_get('@git_resolver')
-      .instance_variable_get('@check_cache')[directory] = {}
-
-    subject.instance_variable_get('@git_resolver').cache[directory] = {}
-
-    subject.add_constraints(
-      url => 'development',
-      'git@github.com:base/core' => '1.0.0 <= v < 2.0.0'
-    )
-  end
-
-  describe '#elm_dependencies' do
-    it 'should return empty hash on error' do
-      expect(ElmInstall::ElmPackage)
-        .to receive(:read)
-        .and_raise 'test'
-
-      expect(subject.elm_dependencies('test')).to eq({})
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 require 'simplecov'
 
-CACHE_DIRECTORY = 'spec/fixtures/cache'.freeze
+CACHE_DIRECTORY = 'spec/cache'.freeze
 
 RSpec.configure do |config|
   config.before do
+    allow(Process).to receive(:exit)
+    allow(ElmInstall::Logger).to receive(:puts)
     FileUtils.mkdir_p CACHE_DIRECTORY
   end
 

data/spec/utils_spec.rb

@@ -1,34 +1,29 @@
-require 'spec_helper'
-
 describe ElmInstall::Utils do
   subject { described_class }
 
   let(:package_variations) do
     [
-      'git@github.com:test/repo',
       'https://github.com/test/repo',
-      'git://github.com/test/repo'
+      'git://github.com/test/repo',
+      'git@github.com:test/repo'
     ]
   end
 
-  describe '.package_version_path' do
-    it 'should return the path for a package in elm-stuff' do
-      package_variations.each do |package|
-        expect(subject.package_version_path(package, '1.0.0'))
-          .to eq(['test/repo', 'elm-stuff/packages/test/repo/1.0.0'])
-      end
-    end
-  end
-
   describe '.transform_constraint' do
     it 'should convert basic constraint' do
       expect(subject.transform_constraint('0.1.0 <= v < 1.0.0'))
-        .to eq(['< 1.0.0', '>= 0.1.0'])
+        .to eq(
+          [Solve::Constraint.new('< 1.0.0'),
+           Solve::Constraint.new('>= 0.1.0')]
+        )
     end
 
     it 'should convert advanced constraint' do
       expect(subject.transform_constraint('0.1.0 < v <= 1.0.0'))
-        .to eq(['<= 1.0.0', '> 0.1.0'])
+        .to eq(
+          [Solve::Constraint.new('<= 1.0.0'),
+           Solve::Constraint.new('> 0.1.0')]
+        )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elm_install
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Gusztáv Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -120,6 +120,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: contracts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: adts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: 
 email: gusztav.szikszai@digitalnatives.hu
 executables:
@@ -140,18 +168,21 @@ files:
 - Rakefile
 - Readme.md
 - bin/elm-install
-- docs/How it works.md
 - elm_install.gemspec
 - lib/elm_install.rb
 - lib/elm_install/base.rb
-- lib/elm_install/cache.rb
-- lib/elm_install/elm_package.rb
-- lib/elm_install/git_resolver.rb
-- lib/elm_install/graph_builder.rb
+- lib/elm_install/dependency.rb
+- lib/elm_install/directory_source.rb
+- lib/elm_install/ext.rb
+- lib/elm_install/git_source.rb
+- lib/elm_install/identifier.rb
 - lib/elm_install/installer.rb
 - lib/elm_install/logger.rb
 - lib/elm_install/populator.rb
+- lib/elm_install/repository.rb
 - lib/elm_install/resolver.rb
+- lib/elm_install/source.rb
+- lib/elm_install/types.rb
 - lib/elm_install/utils.rb
 - lib/elm_install/version.rb
 - package.json
@@ -164,17 +195,12 @@ files:
 - packaging/wrapper.sh
 - scripts/install.js
 - scripts/run.js
-- spec/elm_package_spec.rb
-- spec/eml_install_spec.rb
-- spec/fixtures/cache.json
-- spec/fixtures/elm-package.json
-- spec/fixtures/invalid-elm-package.json
-- spec/fixtures/mismatched-elm-package.json
-- spec/fixtures/ref-cache.json
-- spec/git_resolver_spec.rb
-- spec/graph_builder_spec.rb
+- spec/directory_source_spec.rb
+- spec/elm_install_spec.rb
+- spec/git_source_spec.rb
+- spec/identifer_spec.rb
 - spec/installer_spec.rb
-- spec/populator_spec.rb
+- spec/repository_spec.rb
 - spec/resolver_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb

data/docs/How it works.md

@@ -1,54 +0,0 @@
-Program flow
-------------
-
-1. Try to load the cache of dependencies from `~/.elm-install/cache.json` and
-   load the cache of references from `~/.elm-install/ref-cache.json`. If no
-   cache files found initialize empty caches.
-
-2. Read `dependencies` and `dependency-sources` from `elm-package.json` and
-   transform them from:
-
-   ```
-   {
-     "dependencies": {
-       "elm-lang/core": "5.0.0 <= 6.0.0",
-       "gdotdesign/elm-ui": "1.0.0 <= 2.0.0"
-     },
-     "dependency-sources": {
-       "gdotdesign/elm-ui": {
-         "url": "git@bitbucket.com:gdotdesign/elm-ui",
-         "ref": "development"
-       }
-     }
-   }
-   ```
-
-   to:
-
-   ```
-   {
-     "https://github.com/elm-lang/core": "5.0.0 <= 6.0.0",
-     "git@bitbucket.com:gdotdesign/elm-ui": "development"
-   }
-   ```
-
-3. Add dependencies to the cache, skipping if the package is already added:
-
-   1. If a package is not added, it is cloned from it's remote repository into
-      the cache directory.
-
-   2. Tags are extracted and iterated over, checking out the tag, reading and
-      transforming it's the `elm-package.json` and adding it's dependecies (2.)
-
-4. Try to solve dependencies from the caches.
-
-5. (If no solution found) Go through the packages from the cache and update
-   their references and if it changed update the repository (fetching new
-   content)
-
-6. (If no solution found) Solve dependencies from the updated cache.
-
-7. Save cache.
-
-8. (If solution found) Populate `elm-stuff` and write
-   `elm-stuff/exact-dependecies.json`.

data/lib/elm_install/cache.rb

@@ -1,52 +0,0 @@
-require_relative './base'
-
-module ElmInstall
-  # This class is responsible for maintaining a cache
-  # of all the repositories their versions and their dependencies.
-  #
-  # By default the clones of the repositories live in the users
-  # home directory (~/.elm-install), this can be changed with
-  # the `directory` option.
-  class Cache < Base
-    # Initializes a cache with the given options.
-    #
-    # @param options [Hash] The options
-    def initialize(options)
-      @file = 'cache.json'
-      super options
-    end
-
-    # Adds a new dependency to the cache for a given package & version
-    # combination.
-    #
-    # @param package [String] The url of the package
-    # @param version [String] The semver version (1.0.0 or 1.0.0+master)
-    # @param constraint [Array] The constraint ["pacakge", "<= 1.0.0"]
-    #
-    # @return [Array] The dependencies of the package & version combination
-    def dependency(package, version, constraint)
-      ensure_package version
-      @cache[package][version] << constraint
-    end
-
-    # Ensures that a package & version combination exists in the cache.
-    #
-    # @param package [String] The url of the package
-    # @param version [String] The semver version (1.0.0 or 1.0.0+master)
-    #
-    # @return [Array] The dependencies of the package & version combination
-    def ensure_version(package, version)
-      ensure_package package
-      @cache[package][version] ||= []
-    end
-
-    # Ensures that a package exists in the cache.
-    #
-    # @param package [String] The url of the package
-    #
-    # @return [Hash] The dependency hash of the package
-    def ensure_package(package)
-      @cache[package] ||= {}
-    end
-  end
-end

data/lib/elm_install/elm_package.rb

@@ -1,119 +0,0 @@
-module ElmInstall
-  # This is a class for reading the `elm-package`.json file and
-  # transform it's `dependecies` field to a unified format.
-  module ElmPackage
-    # Returns the dependencies for the given `elm-package`.
-    #
-    # @param path [String] The path for the file
-    #
-    # @return [Hash] The hash of dependenceis (url => version or ref)
-    def self.dependencies(path, options = { silent: true })
-      json = read path, options
-      transform_dependencies(
-        json['dependencies'].to_h,
-        json['dependency-sources'].to_h
-      )
-    end
-
-    # Reads the given file as JSON.
-    #
-    # :reek:DuplicateMethodCall
-    #
-    # @param path [String] The path
-    #
-    # @return [Hash] The json
-    def self.read(path, options = { silent: true })
-      JSON.parse(File.read(path))
-    rescue JSON::ParserError
-      exit "Invalid JSON in file: #{path.bold}.", options
-    rescue Errno::ENOENT
-      exit "Could not find file: #{path.bold}.", options
-    end
-
-    # Exits the current process with the given message.
-    #
-    # @param message [String] The message
-    # @param options [Hash] The options
-    #
-    # @return [void]
-    def self.exit(message, options)
-      return {} if options[:silent]
-      Logger.arrow message
-      Process.exit
-    end
-
-    # Transform dependencies from (package name => version) to
-    # (url => version or ref) format using the `depdendency-sources` field.
-    #
-    # @param raw_dependencies [Hash] The raw dependencies
-    # @param sources [Hash] The sources for the dependencies
-    #
-    # @return [Hash] The dependencies
-    def self.transform_dependencies(raw_dependencies, sources)
-      raw_dependencies.each_with_object({}) do |(package, constraint), memo|
-        value = sources.fetch(package, package)
-
-        transform_dependency package, value, constraint, memo
-      end
-    end
-
-    # Transforms a dependecy.
-    #
-    # :reek:LongParameterList
-    # :reek:DuplicateMethodCall
-    #
-    # @param package [String] The package
-    # @param value [String] The version
-    # @param constraint [String] The constarint
-    # @param memo [Hash] The hash to save the dependency to
-    #
-    # @return [Hash] The memo object
-    def self.transform_dependency(package, value, constraint, memo)
-      if value.is_a?(Hash)
-        check_path package, value['url']
-        memo[value['url']] = value['ref']
-      else
-        url = transform_package(value)
-        check_path package, url
-        memo[url] = constraint
-      end
-    end
-
-    # Checks if the given url matches the given package.
-    #
-    # :reek:DuplicateMethodCall
-    #
-    # @param package [String] The package
-    # @param url [String] The url
-    #
-    # @return [void]
-    def self.check_path(package, url)
-      uri = GitCloneUrl.parse(url)
-      path = uri.path.sub(%r{^/}, '')
-
-      return if path == package
-
-      puts "
-  The source of package #{package.bold} is set to #{url.bold} which would
-  be install to #{"elm-stuff/#{path}".bold}. This would cause a conflict
-  when trying to compile anything.
-
-  The name of a package must match the source url's path.
-
-  #{package.bold} <=> #{path.bold}
-      "
-      Process.exit
-    end
-
-    # Transforms a package to it's url for if needed.
-    #
-    # @param key [String] The package
-    #
-    # @return [String] The url
-    def self.transform_package(key)
-      GitCloneUrl.parse(key).to_s.gsub(/\.git$/, '')
-    rescue
-      "https://github.com/#{key}"
-    end
-  end
-end