[gnome-builder] plugins: cleanup package use by plugins

[Christian Hergert <chergert src gnome org>]

commit d7c2ebba8d896a4f4899b9e97cf45c6b03a6ff55
Author: Christian Hergert <chergert redhat com>
Date:   Fri Sep 22 21:46:46 2017 -0700

    plugins: cleanup package use by plugins
    
    None of our plugins are using packages, so we might as well
    keep things compact and just use modules instead of packages.
    
    This also cleans up the rustup plugin to use gresources.

 .../{cmake_plugin/__init__.py => cmake_plugin.py}  |    0
 src/plugins/cmake/meson.build                      |    2 +-
 .../__init__.py => eslint_plugin.py}               |    0
 src/plugins/eslint/meson.build                     |    3 +--
 .../{make_plugin/__init__.py => make_plugin.py}    |    0
 src/plugins/make/meson.build                       |    2 +-
 src/plugins/meson/meson.build                      |    2 +-
 .../{meson_plugin/__init__.py => meson_plugin.py}  |    0
 src/plugins/rustup/meson.build                     |   12 +++++++++---
 src/plugins/rustup/rustup.gresource.xml            |    6 ++++++
 .../rustup/{rustup_plugin/resources => }/rustup.sh |    0
 .../__init__.py => rustup_plugin.py}               |   12 ++++++------
 12 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/src/plugins/cmake/cmake_plugin/__init__.py b/src/plugins/cmake/cmake_plugin.py
similarity index 100%
rename from src/plugins/cmake/cmake_plugin/__init__.py
rename to src/plugins/cmake/cmake_plugin.py
diff --git a/src/plugins/cmake/meson.build b/src/plugins/cmake/meson.build
index 0ae9b70..559066d 100644
--- a/src/plugins/cmake/meson.build
+++ b/src/plugins/cmake/meson.build
@@ -1,6 +1,6 @@
 if get_option('with_cmake')
 
-install_data('cmake_plugin/__init__.py', install_dir: join_paths(plugindir, 'cmake_plugin'))
+install_data('cmake_plugin.py', install_dir: plugindir)
 
 configure_file(
           input: 'cmake.plugin',
diff --git a/src/plugins/eslint/eslint_plugin/__init__.py b/src/plugins/eslint/eslint_plugin.py
similarity index 100%
rename from src/plugins/eslint/eslint_plugin/__init__.py
rename to src/plugins/eslint/eslint_plugin.py
diff --git a/src/plugins/eslint/meson.build b/src/plugins/eslint/meson.build
index c2b227c..a244e0a 100644
--- a/src/plugins/eslint/meson.build
+++ b/src/plugins/eslint/meson.build
@@ -1,7 +1,6 @@
 if get_option('with_eslint')
 
-eslint_dir = join_paths(plugindir, 'eslint_plugin')
-install_data('eslint_plugin/__init__.py', install_dir: eslint_dir)
+install_data('eslint_plugin.py', install_dir: plugindir)
 
 install_data('org.gnome.builder.plugins.eslint.gschema.xml',
   install_dir: schema_dir)
diff --git a/src/plugins/make/make_plugin/__init__.py b/src/plugins/make/make_plugin.py
similarity index 100%
rename from src/plugins/make/make_plugin/__init__.py
rename to src/plugins/make/make_plugin.py
diff --git a/src/plugins/make/meson.build b/src/plugins/make/meson.build
index 2bf34d1..bd398a9 100644
--- a/src/plugins/make/meson.build
+++ b/src/plugins/make/meson.build
@@ -1,6 +1,6 @@
 if get_option('with_make')
 
-install_data('make_plugin/__init__.py', install_dir: join_paths(plugindir, 'make_plugin'))
+install_data('make_plugin.py', install_dir: plugindir)
 
 configure_file(
           input: 'make.plugin',
diff --git a/src/plugins/meson/meson.build b/src/plugins/meson/meson.build
index dfd90a7..e3dc432 100644
--- a/src/plugins/meson/meson.build
+++ b/src/plugins/meson/meson.build
@@ -1,6 +1,6 @@
 if get_option('with_meson')
 
-install_data('meson_plugin/__init__.py', install_dir: join_paths(plugindir, 'meson_plugin'))
+install_data('meson_plugin.py', install_dir: plugindir)
 
 configure_file(
           input: 'meson.plugin',
diff --git a/src/plugins/meson/meson_plugin/__init__.py b/src/plugins/meson/meson_plugin.py
similarity index 100%
rename from src/plugins/meson/meson_plugin/__init__.py
rename to src/plugins/meson/meson_plugin.py
diff --git a/src/plugins/rustup/meson.build b/src/plugins/rustup/meson.build
index f647926..9f97348 100644
--- a/src/plugins/rustup/meson.build
+++ b/src/plugins/rustup/meson.build
@@ -1,8 +1,14 @@
 if get_option('with_rustup')
 
-rustup_dir = join_paths(plugindir, 'rustup_plugin')
-install_data('rustup_plugin/__init__.py', install_dir: rustup_dir)
-install_subdir('rustup_plugin/resources', install_dir: rustup_dir)
+rustup_resources = gnome.compile_resources(
+  'rustup_plugin',
+  'rustup.gresource.xml',
+  gresource_bundle: true,
+           install: true,
+       install_dir: plugindir,
+)
+
+install_data('rustup_plugin.py', install_dir: plugindir)
 
 configure_file(
           input: 'rustup.plugin',
diff --git a/src/plugins/rustup/rustup.gresource.xml b/src/plugins/rustup/rustup.gresource.xml
new file mode 100644
index 0000000..cf7bc40
--- /dev/null
+++ b/src/plugins/rustup/rustup.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/builder/plugins/rustup_plugin">
+    <file>rustup.sh</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/rustup/rustup_plugin/resources/rustup.sh b/src/plugins/rustup/rustup.sh
similarity index 100%
rename from src/plugins/rustup/rustup_plugin/resources/rustup.sh
rename to src/plugins/rustup/rustup.sh
diff --git a/src/plugins/rustup/rustup_plugin/__init__.py b/src/plugins/rustup/rustup_plugin.py
similarity index 99%
rename from src/plugins/rustup/rustup_plugin/__init__.py
rename to src/plugins/rustup/rustup_plugin.py
index e51ff40..32ae095 100644
--- a/src/plugins/rustup/rustup_plugin/__init__.py
+++ b/src/plugins/rustup/rustup_plugin.py
@@ -40,6 +40,10 @@ from gi.repository import Peas
 
 _ = Ide.gettext
 
+def get_resource(path):
+    full_path = os.path.join('/org/gnome/builder/plugins/rustup_plugin', path)
+    return Gio.resources_lookup_data(full_path, 0).get_data()
+
 def get_module_data_path(name):
     engine = Peas.Engine.get_default()
     plugin = engine.get_plugin_info('rustup_plugin')
@@ -310,11 +314,7 @@ class RustupInstaller(Ide.Transfer):
             launcher.push_argv('/dev/stdin')
             launcher.push_argv('-y')
 
-            try:
-                rustup_sh_path = get_module_data_path('resources/rustup.sh')
-                success, stdin_data = GLib.file_get_contents(rustup_sh_path)
-            except:
-                stdin_data = ""
+            stdin_data = get_resource('rustup.sh')
         elif self.mode == _MODE_UPDATE:
             launcher.push_argv(RustupApplicationAddin.instance.rustup_executable)
             launcher.push_argv('update')
@@ -397,7 +397,7 @@ class RustupInstaller(Ide.Transfer):
                         try:
                             self.props.progress = float(percent)/100
                         except Exception as te:
-                            print('_read_line_cb', self.state, line)
+                            print('_read_line_cb', self.state, line, te)
                 elif self.state == _STATE_DOWN_COMP or self.state == _STATE_SYNC_UPDATE or self.state == 
_STATE_CHECK_UPDATE_SELF  or self.state == _STATE_DOWN_UPDATE_SELF:
                     # the first progress can be empty, skip it
                     if length > 0: