bond-spy 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65fb7c7aa4cf11b582ae1620a91b522d88aaee3
-  data.tar.gz: fc50ff99e60d3c387394c886d48196722f056c6c
+  metadata.gz: 9bdcc8391596c23a7e755612216f518376016165
+  data.tar.gz: b1d60856e4061fad3874d5f9e0720b1dfb72ad87
 SHA512:
-  metadata.gz: dfaa6acd7d9c78967231e194b652db630b271d07d6091a0bc7add63b8c598bf253ca97bd9451216d98203e5a896cd51a8789b999b1ceefd2a73928b7f03aba75
-  data.tar.gz: 72e3e53c5616f4948f8a0d0c2bbf0d758fa2df145a16161bf905421143bc49bebd1946c9596fbc4daf14a52b82f20d8edf3416e1018b6320263ea764ed1e6efe
+  metadata.gz: 85d8e5f478fa20a46b0ba5f06f18db65e76f292b5537546df2df9d10bc487557b5a82066b010ca6b84ce3a36b12b36db8af238066ad788914864e24b99a601af
+  data.tar.gz: 9e02013b8c8d1129a744708a4efb6dbba99c53a9a875fa42b9aa7c99498b3922b1461140c928d06097d48989cc66daad300c104078f695120fe584c2b52c8ad8

data/bin/bond_dialog.py

@@ -0,0 +1,73 @@
+from Tkinter import *
+from ScrolledText import ScrolledText
+import functools
+
+
+class OptionDialog(Frame):
+    """
+    A Tkinter dialog window used for presenting the user with custom options.
+    """
+
+    def __init__(self, master, prompt, options):
+            Frame.__init__(self, master)
+            self.pack()
+            self.last_button = options[-1]
+            self._create_widgets(prompt, options)
+            self._center(master)
+            master.deiconify()
+            # PyCharm likes to grab focus back from the dialog if the window is only marked as
+            # topmost temporarily, which is very annoying, so leave it as topmost.
+            # TODO ETK When settings are better laid out, this should be configurable.
+            master.attributes('-topmost', 1)
+
+    @staticmethod
+    def create_dialog_get_value(prompt, options):
+        """
+        The main entrypoint; creates a dialog, presents it to the user, and returns
+        the value selected by the user. If the user closes the dialog box before selecting
+        an option, the default option is used.
+        :param prompt: The prompt string to display to the user.
+        :param options: A tuple of options (strings) to display to the user, which will
+                        each get their own button. The last option is the default.
+        :return: The option that the user selected.
+        """
+        root = Tk()
+        root.title('Bond Reconciliation')
+        dialog = OptionDialog(root, prompt, options)
+        dialog.mainloop()
+        try:
+            root.destroy()
+        except TclError:
+            pass  # Probably already destroyed, just ignore
+        return dialog.last_button
+
+    def _create_widgets(self, prompt, options):
+
+        def fill_last_button(button_text):
+            self.last_button = button_text
+            self.quit()
+
+        num_cols = max(50, max(map(lambda line: len(line), prompt.split('\n'))))
+        num_rows = prompt.count('\n') + 2
+
+        textbox = ScrolledText(self, relief='flat', padx='8', pady='5',
+                               height=num_rows, width=num_cols)
+        textbox.insert(INSERT, prompt)
+        textbox['state'] = DISABLED
+        textbox.pack(side='top')
+
+        for option in reversed(options):
+            opt_button = Button(self,
+                                text=option,
+                                command=functools.partial(fill_last_button, option),
+                                default='active' if option == options[-1] else 'normal')
+            opt_button.pack(side='right')
+
+    def _center(self, master):
+        master.update_idletasks()
+        screen_width = master.winfo_screenwidth()
+        screen_height = master.winfo_screenheight()
+        size_x, size_y = tuple(int(_) for _ in master.geometry().split('+')[0].split('x'))
+        x = screen_width/2 - size_x/2
+        y = screen_height/2 - size_y/2
+        master.geometry("{}x{}+{}+{}".format(size_x, size_y, x, y))

data/bond.gemspec

@@ -3,7 +3,7 @@ require_relative 'lib/bond/version'
 Gem::Specification.new do |spec|
   spec.name          = 'bond-spy'
   spec.version       = Bond::VERSION
-  spec.date          = '2016-02-04'
+  spec.date          = '2016-02-18'
 
   spec.authors       = ['George Necula', 'Erik Krogen']
   spec.email         = ['necula@cs.berkeley.edu', 'erikkrogen@gmail.com']

data/lib/bond.rb

@@ -232,6 +232,7 @@ class Bond
   # has already been JSON-serialized and outputs them all as a JSON array.
   # @param fname [String] Path where the file should be saved.
   def save_observations(fname)
+    FileUtils.mkdir_p(File.dirname(fname))
     File.open(fname, 'w') do |f|
       f.print("[\n#{@observations.join(",\n")}\n]\n")
     end

data/lib/bond/spec_helper.rb

@@ -26,7 +26,7 @@ shared_context :bond do |**settings|
 
   after :each do
     if bond.send(:finish_test) == :bond_fail
-      fail('BOND_FAIL. Pass BOND_RECONCILE=[kdiff3|console|accept] environment variable to reconcile the observations.')
+      fail('BOND_FAIL. Pass BOND_RECONCILE=[kdiff3|console|dialog|accept] environment variable to reconcile the observations.')
     end
   end
 end

data/lib/bond/version.rb

@@ -1,3 +1,3 @@
 class Bond
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bond-spy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - George Necula
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -93,6 +93,7 @@ files:
 - LICENSE
 - README.rst
 - Rakefile
+- bin/bond_dialog.py
 - bin/bond_reconcile.py
 - bin/setup
 - bond.gemspec