fig 1.25.0 → 1.25.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4ba532ae69a9f015857a75087711f0035b8e1f
-  data.tar.gz: 14aa4ca9bbc5f675aca7adb3e4fe51a5e53c27aa
+  metadata.gz: f5483f7ec213c7f847e240606b4b1657938e2e3a
+  data.tar.gz: be24f8d3c1de10e8211fd221bed6f79f55b2a5a4
 SHA512:
-  metadata.gz: 4e141cbf1cb3c2674a63983bb292d7ee2139cf019f793b0e7dfcbc778bcafae9907a4699e528700e669557d3f90005b44f5f57929fb0819b575592bee48e7b94
-  data.tar.gz: 5cfcd0e44465230489fa2c260970f13c79c5ae978834824626fa25e438bf2c9ea717958085c105eefb8a38c5e7110e16e1bc1b027ebb8871b39d83a12df99320
+  metadata.gz: 94ce2975c84cfbd2b25f4bc08c479fa39c019477a146e97fd06e13808fa307b1faf495ec8b6e04de59a44d8137949e7c87963827f50f9a3094ea15681c96feab
+  data.tar.gz: df3673063a6b056b81ccb072b8519ad2a382be6c3a333a5516496f1fa6b5d31479da59b18fab3bc385443e1d0c5d8497a52e6067ae0386524f7e0247701d5721

data/BUGS.md

@@ -1,5 +1,8 @@
 - `sftp:` URLs are subject to https://github.com/net-ssh/net-sftp/issues/27.
 - Packages containing symlinks fail to install on Windows.  libarchive doesn't corectly report them as symlinks.
 - Bad values in `FIG_HOME` and `FIG_REMOTE_URL` produce nasty errors.
+- The internal storage for home directory layouts in v2 format don't take the
+  value of `FIG_REMOTE_URL` into account, meaning that, if you switch
+  `FIG_REMOTE_URL` without also switching `FIG_HOME`, "fun" things can happen.
 - URLs with query parameters or involve redirects are untested.
 - Repository locking doesn't happen on Windows.

data/Changes

@@ -1,9 +1,27 @@
-v1.25.0 - 2015/05/11
+v1.25.1.beta.1 - 2015/6/3
+
+  Bug fixes:
+
+  - Better checking of whether files are up-to-date in FTP and SFTP downloads
+    and better error message emitted when corrupt local copy of remote figrc is
+    found.
+
+  Miscellaneous:
+
+  - As previously announced, Fig now requires Ruby v2.0.0.  You should probably
+    use something later than v2.0, though; the test suite on MRI v2.0.0 takes
+    almost twice as long to run as it does on MRI v2.2.0.
+
+  - Now looks for ./.fig on startup and complains if it exists and it isn't a
+    directory in order to prevent problems with naughty users running from
+    within a repository.
+
+v1.25.0 - 2015/5/11
 
   Announcement:
 
-  - This is the final version that will support Ruby 1.9.x.  The next version
-    will require Ruby 2.0.0.
+  - This is the final version that will support Ruby v1.9.x.  The next version
+    will require Ruby v2.0.0.
 
   Bug fixes:
 
@@ -39,13 +57,13 @@ v1.25.0 - 2015/05/11
   - A blank line is added after grammar statements in published packages in
     order to seperate them from other statements.
 
-v1.24.1.beta.3 - 2015/04/27
-v1.24.1.beta.2 - 2015/04/24
-v1.24.1.beta.1 - 2015/04/23
+v1.24.1.beta.3 - 2015/4/27
+v1.24.1.beta.2 - 2015/4/24
+v1.24.1.beta.1 - 2015/4/23
 
   - Test releases.
 
-v1.24.0 - 2015/01/13
+v1.24.0 - 2015/1/13
 
   New feature:
 
@@ -59,11 +77,11 @@ v1.24.0 - 2015/01/13
   - All I/O now done using UTF-8 as the encoding.
   - No longer uses the open4 gem.
 
-v1.23.1.beta.1 - 2015/01/09
+v1.23.1.beta.1 - 2015/1/9
 
   - Test release.
 
-v1.23.0 - 2015/01/02
+v1.23.0 - 2015/1/2
 
   Bug fixes:
 
@@ -232,17 +250,17 @@ v1.12.0 - 2013/10/14
     but just for pulling down dependencies.
 
 v1.11.1.beta.2 - 2013/10/11
-v1.11.1.beta.1 - 2013/10/09
+v1.11.1.beta.1 - 2013/10/9
 
   - Test releases.
 
-v1.11.0 - 2013/09/25
+v1.11.0 - 2013/9/25
 
   Bug fixes:
 
   - Fix crash with quoted command-lines.
 
-v1.10.0 - 2013/09/25
+v1.10.0 - 2013/9/25
 
   Bug fixes:
 
@@ -254,12 +272,12 @@ v1.10.0 - 2013/09/25
   - Resource statements that refer to directories will now pull in the full
     directory contents instead of just the directory itself.
 
-v1.9.1.beta.2 - 2013/09/20
-v1.9.1.beta.1 - 2013/09/19
+v1.9.1.beta.2 - 2013/9/20
+v1.9.1.beta.1 - 2013/9/19
 
   - Test releases.
 
-v1.9.0 - 2013/09/19
+v1.9.0 - 2013/9/19
 
   Bug fixes:
 

data/lib/fig.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Fig
-  VERSION = '1.25.0'
+  VERSION = '1.25.1.beta.1'
 end

data/lib/fig/command/action.rb

@@ -21,7 +21,9 @@ module Fig::Command::Action
   end
 
   def options()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # Is this a special Action that should just be run on its own without looking
@@ -32,7 +34,9 @@ module Fig::Command::Action
   end
 
   def descriptor_requirement()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def allow_both_descriptor_and_file?()
@@ -46,7 +50,9 @@ module Fig::Command::Action
   end
 
   def modifies_repository?()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def prepare_repository(repository)
@@ -54,7 +60,9 @@ module Fig::Command::Action
   end
 
   def load_base_package?()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def base_package_can_come_from_descriptor?()
@@ -63,17 +71,23 @@ module Fig::Command::Action
 
   # true, false, or nil if don't care.
   def register_base_package?()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # true, false, or nil if don't care.
   def apply_config?()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # true, false, or nil if don't care.
   def apply_base_config?()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def remote_operation_necessary?()
@@ -116,6 +130,8 @@ module Fig::Command::Action
   end
 
   def execute()
-    raise NotImplementedError
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 end

data/lib/fig/command/initialization.rb

@@ -3,8 +3,8 @@
 # This is not a normal module/class.  It contains code to be run by bin/fig and
 # bin/fig-debug just after process startup.
 
-( [1, 9, 2] <=> ( RUBY_VERSION.split(".").collect {|x| x.to_i} ) ) <= 0 or
-  abort "Ruby v1.9.2 is required; this is v#{RUBY_VERSION}."
+( [2, 0, 0] <=> ( RUBY_VERSION.split(".").collect {|x| x.to_i} ) ) <= 0 or
+  abort "Ruby v2.0.0 is required; this is v#{RUBY_VERSION}."
 
 if ENV['FIG_COVERAGE']
   require File.expand_path(

data/lib/fig/deparser.rb

@@ -118,7 +118,9 @@ module Fig::Deparser
   end
 
   def command(statement)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def configuration(configuration_statement)
@@ -149,7 +151,9 @@ module Fig::Deparser
   end
 
   def grammar_version(statement)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def include(statement)
@@ -165,7 +169,9 @@ module Fig::Deparser
   end
 
   def include_file(statement)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def override(statement)
@@ -193,7 +199,9 @@ module Fig::Deparser
   end
 
   def retrieve(statement)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def set(statement)
@@ -209,13 +217,17 @@ module Fig::Deparser
   end
 
   def grammar_description
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   private
 
   def asset(keyword, statement)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def asset_path(statement)
@@ -227,7 +239,9 @@ module Fig::Deparser
   end
 
   def environment_variable(statement, keyword)
-    raise NotImplementedError.new self
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def add_indent(indent_level = @indent_level)

data/lib/fig/figrc.rb

@@ -106,9 +106,16 @@ class Fig::FigRC
 
     begin
       configuration_text = File.open(repo_figrc_path).read
+      if configuration_text.empty?
+        raise Fig::ConfigFileError.new(
+          "Local copy (#{repo_figrc_path}) of #{figrc_url} is empty!",
+          figrc_url,
+        )
+      end
+
       configuration.push_dataset JSON.parse(configuration_text)
     rescue JSON::ParserError => exception
-      translate_parse_error(exception, figrc_url)
+      translate_parse_error(exception, repo_figrc_path)
     end
 
     return

data/lib/fig/protocol/ftp.rb

@@ -64,8 +64,13 @@ class Fig::Protocol::FTP
       ftp = Net::FTP.new(uri.host)
       ftp_login(ftp, uri.host, prompt_for_login)
 
-      if ::File.exist?(path) && ftp.mtime(uri.path) <= ::File.mtime(path)
+      if (
+            ::File.exist?(path)                       \
+        &&  ftp.mtime(uri.path) <= ::File.mtime(path) \
+        &&  ftp.size(uri.path) == ::File.size(path)
+      )
         Fig::Logging.debug "#{path} is up to date."
+
         return false
       else
         log_download(uri, path)

data/lib/fig/protocol/sftp.rb

@@ -84,7 +84,11 @@ class Fig::Protocol::SFTP
         # when the remote path does not exist.
         stat = connection.stat!(uri.path)
 
-        if ::File.exist?(path) && stat.mtime.to_f <= ::File.mtime(path).to_f
+        if (
+              ::File.exist?(path)                         \
+          &&  stat.mtime.to_f <= ::File.mtime(path).to_f  \
+          &&  stat.size != ::File.size(path)
+        )
           Fig::Logging.debug "#{path} is up to date."
           return false
         end

data/lib/fig/statement.rb

@@ -39,7 +39,9 @@ class Fig::Statement
   # A name for this kind of Statement, usually a keyword for this statement as
   # it appears in package definition files.
   def statement_type()
-    raise NotImplementedError.new self.class.name
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # Block will receive a Statement.
@@ -48,19 +50,25 @@ class Fig::Statement
   end
 
   def deparse_as_version(deparser)
-    raise NotImplementedError.new self.class.name
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # Returns a two element array containing the version and an explanation of
   # why the version is necessary if the version is greater than 0.
   def minimum_grammar_for_emitting_input()
-    raise NotImplementedError.new self.class.name
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   # Returns a two element array containing the version and an explanation of
   # why the version is necessary if the version is greater than 0.
   def minimum_grammar_for_publishing()
-    raise NotImplementedError.new self.class.name
+    raise NotImplementedError.new(
+      "#{__callee__}() not implemented on #{self.class}."
+    )
   end
 
   def urls()

data/lib/fig/working_directory_maintainer.rb

@@ -7,6 +7,7 @@ require 'fig/logging/colorizable'
 require 'fig/package_descriptor'
 require 'fig/repository_error'
 require 'fig/working_directory_metadata'
+require 'fig/user_input_error'
 
 module Fig; end
 
@@ -20,6 +21,16 @@ class Fig::WorkingDirectoryMaintainer
     @base_dir = base_dir
     @package_metadata_by_name = {}
     @local_fig_data_directory = File.join(@base_dir, '.fig')
+
+    if (
+          File.exist?(@local_fig_data_directory)        \
+      &&  ! File.directory?(@local_fig_data_directory)
+    )
+      raise Fig::UserInputError.new(
+        %Q<"#{@local_fig_data_directory}" exists and it isn't a directory. Are you running inside a repository?>
+      )
+    end
+
     @metadata_file = File.join(@local_fig_data_directory, 'retrieve')
 
     if File.exist?(@metadata_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.25.1.beta.1
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -402,12 +402,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2