elm_install 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f5a56400929b580f8e2aef6cfddae1d98c7fe43
-  data.tar.gz: 6cb79fca1fe9aa577a7f02495a27b2d15e896eb1
+  metadata.gz: 3a03f6fdb1a42bea5c14a87c7faa22623c146fbd
+  data.tar.gz: b484dc5f2566e0155da8a959a2ae1bf761f1ae10
 SHA512:
-  metadata.gz: 20a1ee8f69fc2da9b1d94bd3bdbadb1e1b07e5ef2a879465d71a6c76260d29b688003a0098177565495506886de7faf2405809d2c0ab3cb3dd74cab0b0224ebc
-  data.tar.gz: 5a476a8769744e1dd5b86fa7c7cf66f8636bdda9fdac0bde39d92060bd4ddbac47cfc3a062cbfb26c5cf61cabd033957a9aca38547cd732ecae2ab22c70127c7
+  metadata.gz: d783886b984c689ea08f652fae2e909c6a441820c2fa22f0defa657643b736347c5ad5f9d93e6ead8ef8eeed46a39f4864dae03f11d55547c072c9dc19c50b14
+  data.tar.gz: 9a04dd69660a65a3a802ad1455c54a9c06be9612772f27b695b6b4cc43b90dfebe97467976c7915085afb8280713b4bf39405c1f0ed1b5fc5f80e2a2d65661d6

data/.gitignore

@@ -3,3 +3,6 @@ elm-stuff
 tmp
 elm-package.json
 pkg
+packaging/vendor
+packaging/elm-install*
+packaging/traveling-ruby*

data/.rubocop.yml

@@ -1,2 +1,5 @@
+AllCops:
+  Exclude:
+    - 'packaging/**/*'
 Style/FrozenStringLiteralComment:
   Enabled: False

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.2.2

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    elm_install (0.1.0)
-      colorize (~> 0.8.1)
+    elm_install (0.1.1)
       commander (~> 4.4, >= 4.4.2)
       git (~> 1.3)
       git_clone_url (~> 2.0)
+      hashdiff (~> 0.3.1)
+      smart_colored (~> 1.1, >= 1.1.1)
       solve (~> 3.1)
 
 GEM
@@ -22,7 +23,6 @@ GEM
       virtus (~> 1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    colorize (0.8.1)
     commander (4.4.2)
       highline (~> 1.7.2)
     descendants_tracker (0.0.4)
@@ -42,6 +42,7 @@ GEM
     git (1.3.0)
     git_clone_url (2.0.0)
       uri-ssh_git (>= 2.0)
+    hashdiff (0.3.1)
     highline (1.7.8)
     ice_nine (0.11.2)
     launchy (2.4.3)
@@ -90,6 +91,7 @@ GEM
       virtus (~> 1.0)
     semverse (2.0.0)
     sexp_processor (4.7.0)
+    smart_colored (1.1.1)
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)

data/Rakefile

@@ -4,5 +4,5 @@ Bundler::GemHelper.install_tasks
 
 task :ci do
   sh 'rubocop'
-  sh 'rubycritic -m --no-browser -s 90'
+  sh 'rubycritic -m --no-browser -s 90 lib'
 end

data/elm_install.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
   s.test_files =
     `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  puts `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-
   s.executables =
     `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
@@ -24,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'git_clone_url', '~> 2.0'
   s.add_dependency 'solve', '~> 3.1'
   s.add_dependency 'commander', '~> 4.4', '>= 4.4.2'
-  s.add_dependency 'colorize', '~> 0.8.1'
+  s.add_dependency 'smart_colored', '~> 1.1', '>= 1.1.1'
+  s.add_dependency 'hashdiff', '~> 0.3.1'
 
   s.extra_rdoc_files = ['Readme.md']
 end

data/lib/elm_install.rb

@@ -1,7 +1,8 @@
+require 'smart_colored/extend'
 require 'git_clone_url'
 require 'forwardable'
 require 'fileutils'
-require 'colorize'
+require 'hashdiff'
 require 'solve'
 require 'json'
 require 'git'

data/lib/elm_install/cache.rb

@@ -15,22 +15,30 @@ module ElmInstall
     # Initializes a new cache with the given options.
     def initialize(options = {})
       @options = options
+      @ref_cache = {}
       @cache = {}
       load
     end
 
     # Saves the cache into the json file.
     def save
+      File.binwrite(ref_file, JSON.pretty_generate(@ref_cache))
       File.binwrite(file, JSON.pretty_generate(@cache))
     end
 
     # Loads a cache from the json file.
     def load
+      @ref_cache = JSON.parse(File.read(ref_file))
       @cache = JSON.parse(File.read(file))
     rescue
+      @ref_cache = {}
       @cache = {}
     end
 
+    def clear
+      @ref_cache = {}
+    end
+
     # Returns the directory where the cache is stored.
     def directory
       @options[:directory] || File.join(Dir.home, '.elm-install')
@@ -38,7 +46,7 @@ module ElmInstall
 
     # Returns if there is a package in the cache (with at least one version).
     def package?(package)
-      @cache.key?(package)
+      @ref_cache.key?(package) && @cache.key?(package)
     end
 
     # Adds a new dependency to the cache for a given package & version
@@ -71,14 +79,38 @@ module ElmInstall
       if Dir.exist?(repo_path)
         repo = Git.open(repo_path)
         repo.reset_hard
+
+        unless @ref_cache[path]
+          refs = refs_for(repo_path)
+
+          if HashDiff.diff(@ref_cache[path], refs).empty?
+            Utils.log_with_arrow "Package: #{path.bold} is outdated fetching changes..."
+            repo.fetch
+          end
+
+          @ref_cache[path] = refs
+        end
+
         repo
       else
-        Git.clone(path, repo_path)
+        Utils.log_with_arrow "Package: #{path.bold} not found in cache, cloning..."
+        repo = Git.clone(path, repo_path)
+        @ref_cache[path] = refs_for(repo_path)
+        repo
       end
     end
 
     private
 
+    def refs_for(repo_path)
+      refs = Git.ls_remote(repo_path)
+      refs.delete('head')
+    end
+
+    def ref_file
+      File.join(directory, 'ref-cache.json')
+    end
+
     # Returns the path to the json file.
     def file
       File.join(directory, 'cache.json')

data/lib/elm_install/installer.rb

@@ -20,17 +20,36 @@ module ElmInstall
       puts 'Resolving packages...'
       resolver.add_constraints dependencies
 
-      puts 'Saving index cache...'
-      @cache.save
-
       puts 'Solving dependencies...'
-      populate_elm_stuff
-
-      puts 'Packages configured successfully!'
+      begin
+        populate_elm_stuff
+      rescue
+        puts ' ▶ Could not find a solution in local cache, refreshing packages...'
+
+        @cache.clear
+        resolver.add_constraints dependencies
+
+        begin
+          populate_elm_stuff
+        rescue Solve::Errors::NoSolutionError => e
+          puts 'Could not find a solution:'
+          puts indent(e.to_s)
+        end
+      end
     end
 
     private
 
+    def indent(str)
+      str.split("\n").map { |s| "  #{s}" }.join("\n")
+    end
+
+    def end_sucessfully
+      puts 'Saving package cache...'
+      @cache.save
+
+      puts 'Packages configured successfully!'
+    end
     # Populates the `elm-stuff` directory with the packages from
     # the solution.
     def populate_elm_stuff
@@ -39,6 +58,7 @@ module ElmInstall
       end
 
       write_exact_dependencies
+      end_sucessfully
     end
 
     # Resolves and copies a package and it's version to `elm-stuff/packages`
@@ -54,7 +74,7 @@ module ElmInstall
       @cache.repository(package).checkout(ref)
 
       version_str = ref == version ? ref : "#{ref}(#{version})"
-      Utils.log_with_dot "#{package_name} - #{version_str}"
+      Utils.log_with_dot "#{package_name.bold} - #{version_str.bold}"
 
       return if Dir.exist?(package_path)
 

data/lib/elm_install/resolver.rb

@@ -54,8 +54,6 @@ module ElmInstall
     def add_package(package)
       return if @cache.package?(package)
 
-      Utils.log_with_dot "Package: #{package} not found in cache, cloning..."
-
       @cache
         .repository(package)
         .tags

data/lib/elm_install/utils.rb

@@ -23,6 +23,10 @@ module ElmInstall
       puts '  ● '.green + message
     end
 
+    def log_with_arrow(message)
+      puts "  ▶ #{message}"
+    end
+
     def package_version_path(package, version)
       package_name = GitCloneUrl.parse(package).path
       [package_name, File.join('elm-stuff', 'packages', package_name, version)]

data/lib/elm_install/version.rb

@@ -1,3 +1,3 @@
 module ElmInstall
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/packaging/.ruby-gemset

@@ -0,0 +1 @@
+elm-install

data/packaging/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+ruby '2.2.2'
+
+gem 'elm_install'

data/packaging/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colorize (0.8.1)
+    commander (4.4.2)
+      highline (~> 1.7.2)
+    elm_install (0.1.0)
+      colorize (~> 0.8.1)
+      commander (~> 4.4, >= 4.4.2)
+      git (~> 1.3)
+      git_clone_url (~> 2.0)
+      solve (~> 3.1)
+    git (1.3.0)
+    git_clone_url (2.0.0)
+      uri-ssh_git (>= 2.0)
+    highline (1.7.8)
+    molinillo (0.5.4)
+    semverse (2.0.0)
+    solve (3.1.0)
+      molinillo (>= 0.5)
+      semverse (>= 1.1, < 3.0)
+    uri-ssh_git (2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  elm_install
+
+RUBY VERSION
+   ruby 2.2.2p95
+
+BUNDLED WITH
+   1.13.6

data/packaging/Rakefile

@@ -0,0 +1,93 @@
+# For Bundler.with_clean_env
+require 'bundler/setup'
+require_relative '../lib/elm_install'
+
+PACKAGE_NAME = 'elm-install'.freeze
+VERSION = ElmInstall::VERSION
+TRAVELING_RUBY_VERSION = '20150715-2.2.2'.freeze
+
+desc 'Package your app'
+task package: ['package:linux:x86', 'package:linux:x86_64', 'package:osx']
+
+namespace :package do
+  namespace :linux do
+    desc 'Package your app for Linux x86'
+    task x86: [
+      :bundle_install,
+      "traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"
+    ] do
+      create_package('linux-x86')
+    end
+
+    desc 'Package your app for Linux x86_64'
+    task x86_64: [
+      :bundle_install,
+      "traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"
+    ] do
+      create_package('linux-x86_64')
+    end
+  end
+
+  desc 'Package your app for OS X'
+  task osx: [
+    :bundle_install,
+    "traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"
+  ] do
+    create_package('osx')
+  end
+
+  desc 'Install gems to local directory'
+  task :bundle_install do
+    sh 'rm -rf tmp'
+    sh 'mkdir tmp'
+    sh 'cp Gemfile Gemfile.lock tmp/'
+    Bundler.with_clean_env do
+      sh 'cd tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development'
+    end
+    sh 'rm -rf tmp'
+    sh 'rm -f vendor/*/*/cache/*'
+  end
+end
+
+file "traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime('linux-x86')
+end
+
+file "traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime('linux-x86_64')
+end
+
+file "traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime('osx')
+end
+
+def create_package(target)
+  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+  sh "rm -rf #{package_dir}"
+  sh "mkdir #{package_dir}"
+  sh "mkdir -p #{package_dir}/lib/app"
+  sh "mkdir #{package_dir}/lib/ruby"
+  sh "tar -xzf traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  sh "cp wrapper.sh #{package_dir}/elm-install"
+  sh "chmod +x #{package_dir}/elm-install"
+  sh "cp -pR vendor #{package_dir}/lib/"
+  sh "cp Gemfile Gemfile.lock #{package_dir}/lib/vendor/"
+  sh "mkdir #{package_dir}/lib/vendor/.bundle"
+  sh "cp bundler-config #{package_dir}/lib/vendor/.bundle/config"
+
+  sh 'rm -rf lib/vendor/ruby/*/gems/*/test'
+  sh 'rm -rf lib/vendor/ruby/*/gems/*/tests'
+  sh 'rm -rf lib/vendor/ruby/*/gems/*/spec'
+  sh 'rm -rf lib/vendor/ruby/*/gems/*/features'
+  sh 'rm -rf lib/vendor/ruby/*/gems/*/benchmark'
+
+  unless ENV['DIR_ONLY']
+    sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    sh "rm -rf #{package_dir}"
+  end
+end
+
+def download_runtime(target)
+  sh 'curl -L -O --fail ' \
+     "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+end

data/packaging/bundler-config

@@ -0,0 +1,3 @@
+BUNDLE_PATH: .
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/packaging/wrapper.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`dirname \"$0\"`"
+SELFDIR="`cd \"$SELFDIR\" && pwd`"
+
+export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# Run the actual binary using the bundled Ruby.
+exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/lib/vendor/ruby/2.2.0/bin/elm-install" "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elm_install
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gusztáv Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -73,19 +73,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.4.2
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: smart_colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.3.1
 description: 
 email: gusztav.szikszai@digitalnatives.hu
 executables:
@@ -111,6 +131,12 @@ files:
 - lib/elm_install/resolver.rb
 - lib/elm_install/utils.rb
 - lib/elm_install/version.rb
+- packaging/.ruby-gemset
+- packaging/Gemfile
+- packaging/Gemfile.lock
+- packaging/Rakefile
+- packaging/bundler-config
+- packaging/wrapper.sh
 homepage: https://github.com/gdotdesign/elm-github-install
 licenses: []
 metadata: {}
@@ -130,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Install Elm packages from git repositories.